diff --git a/doc/E1AP/E1-design.md b/doc/E1AP/E1-design.md
index 04d19bb514..4dd042f87d 100644
--- a/doc/E1AP/E1-design.md
+++ b/doc/E1AP/E1-design.md
@@ -79,7 +79,7 @@ More details about the E1AP procedures in OAI are available in this document: [E
 
 # 2. Running the E1 Split
 
-The setup is assuming that all modules are running on the same machine. The user can refer to the [F1 design document](./../F1-design.md) for local deployment of the DU.
+The setup is assuming that all modules are running on the same machine. The user can refer to the [F1 design document](./../F1AP/F1-design.md) for local deployment of the DU.
 
 ## 2.1 Configuration File
 
diff --git a/doc/F1-design.md b/doc/F1AP/F1-design.md
similarity index 100%
rename from doc/F1-design.md
rename to doc/F1AP/F1-design.md
diff --git a/doc/F1AP/F1AP-lib.md b/doc/F1AP/F1AP-lib.md
new file mode 100644
index 0000000000..46712914ed
--- /dev/null
+++ b/doc/F1AP/F1AP-lib.md
@@ -0,0 +1,69 @@
+<table style="border-collapse: collapse; border: none;">
+  <tr style="border-collapse: collapse; border: none;">
+    <td style="border-collapse: collapse; border: none;">
+      <a href="http://www.openairinterface.org/">
+         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
+         </img>
+      </a>
+    </td>
+    <td style="border-collapse: collapse; border: none; vertical-align: center;">
+      <b><font size = "5">F1AP Messages Encoding & Decoding Library</font></b>
+    </td>
+  </tr>
+</table>
+
+[[_TOC_]]
+
+
+# Intro
+
+This library is for the encoding, decoding and testing of F1AP (F1 Application Protocol) messages.
+
+# Implementation Details
+
+The library includes the following components:
+
+1. **Common Functions**:
+
+This file [f1ap_lib_common.c](../../openair2/F1AP/lib/f1ap_lib_common.c) and its corresponding header contain utility functions and macros shared across different F1AP functions.
+
+2. **Message-Specific Modules**:
+
+Each F1AP message (e.g., DL RRC, UL RRC, etc.) has its corresponding modules and each module will include the encoder, decoder, equality check, and memory management functions specific to that message type. Specifically, the goal is to achieve the following:
+
+* **Encoder & Decoder**: Implement encoding and decoding functions for each F1AP message. These functions will convert F1AP messages coming from upper or lower layers into an F1AP PDU to be sent over F1 interface.
+* **Equality Check (eq_X)**: `eq_X()` function that compares two messages for equality. This function is useful for testing purposes, ensuring that encoded and decoded messages match.
+* **Deep Copy (cp_X)**: `cp_X()` function that performs a deep copy of a message. This function is beneficial when sending ITTI messages, as it avoids manual copying.
+* **Memory Management (free_X)**: `free_X()` function to release memory associated with a message. Proper memory management helps prevent memory leaks.
+
+e.g. The following module contains functions that performs the encoding/decoding, equality check, deep copy and memory management for DL/UL RRC message transfer:
+
+* [f1ap_rrc_message_transfer.c](../../openair2/F1AP/lib/f1ap_rrc_message_transfer.c)
+
+# Testing
+
+The functions in the file [f1ap_lib_common.c](../../openair2/F1AP/tests/f1ap_lib_test.c) are used to test F1AP message encoding and decoding functionalities, according to the following steps:
+
+* call the encoder function for the message to be transferred into a F1AP PDU
+* use `f1ap_encode_decode` to perform the following steps:
+  - Validates the input encoded PDU against constraints.
+  - Encodes the PDU using APER into a binary buffer.
+  - Decodes the binary buffer back into a PDU.
+  - Returns the decoded PDU.
+* call the decoder function for the decoded F1AP PDU to obtain the decoded message
+* call `eq_dl_rrc_message_transfer` to compare the original message with the decoded one
+* call `cp_dl_rrc_message_transfer` to deep copy the original message, then compare the with the original one
+* free all messages and PDUs
+
+A flowchart for a function testing F1AP messages, such as `test_f1ap_setup_request`, would look like this:
+
+```mermaid
+flowchart TD
+    create[Create F1AP message]-->|f1ap_setup_req_t msg|enc[encode_f1ap_setup_request]
+    enc-->|F1AP_F1AP_PDU_t *f1enc|encdec[f1ap_encode_decode]
+    encdec-->|F1AP_F1AP_PDU_t *f1dec|dec[decode_f1ap_setup_request]
+    create-->|f1ap_setup_req_t msg|eq
+    dec-->|f1ap_setup_req_t decoded|eq[eq_f1ap_setup_request]
+    create-->|f1ap_setup_req_t msg|cp[cp_f1ap_setup_request]
+    cp-->|f1ap_setup_req_t cp|eq[eq_f1ap_setup_request]
+```
diff --git a/doc/README.md b/doc/README.md
index 70e8bf05be..7f57a24eb0 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -65,7 +65,7 @@ Legacy unmaintained files:
 
 - General software architecture notes: [SW_archi.md](./SW_archi.md)
 - [Information on E1](./E1AP/E1-design.md)
-- [Information on F1](./F1-design.md)
+- [Information on F1](./F1AP/F1-design.md)
 - [Information on how NR nFAPI works](./NR_NFAPI_archi.md)
 - [Flow graph of the L1 in gNB](SW-archi-graph.md)
 - [L1 threads in NR-UE](./nr-ue-design.md)
diff --git a/doc/UnitTests.md b/doc/UnitTests.md
index aa6b7b1123..76cfe7bee1 100644
--- a/doc/UnitTests.md
+++ b/doc/UnitTests.md
@@ -24,6 +24,10 @@ cmake .. -GNinja -DENABLE_TESTS=ON
 ninja tests
 ```
 
+The user can use either `ninja` or `make`.
+
+# Run unit tests
+
 Then, you can run `ctest` to run all tests:
 
 ```bash