diff --git a/doc/Doxyfile b/doc/Doxyfile
index e67078a043..e91e63386f 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Full experimental OpenSource LTE and NR implementation
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           = @CMAKE_SOURCE_DIR@/doc/oai_logo.png
+PROJECT_LOGO           = @CMAKE_SOURCE_DIR@/doc/images/oai_logo.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/doc/FEATURE_SET.md b/doc/FEATURE_SET.md
index f759ddf145..4429cad56b 100644
--- a/doc/FEATURE_SET.md
+++ b/doc/FEATURE_SET.md
@@ -11,12 +11,12 @@
 -  FAPI (IF2)  : specified by Small Cell Forum (open-nFAPI implementation)
 -  IF1         : F1 in 3GPP Release 15
 
-![Functional Split Architecture](./oai_enb_func_split_arch.png)
+![Functional Split Architecture](./images/oai_enb_func_split_arch.png)
 
 
 # OpenAirInterface Block Diagram #
 
-![Block Diagram](./oai_enb_block_diagram.png)
+![Block Diagram](./images/oai_enb_block_diagram.png)
 
 # OpenAirInterface 5G-NR Feature Set #
 
diff --git a/doc/nr-ue-threads.svg b/doc/images/nr-ue-threads.svg
similarity index 100%
rename from doc/nr-ue-threads.svg
rename to doc/images/nr-ue-threads.svg
diff --git a/doc/oai_enb_func_split_arch.png b/doc/images/oai_enb_func_split_arch.png
similarity index 100%
rename from doc/oai_enb_func_split_arch.png
rename to doc/images/oai_enb_func_split_arch.png
diff --git a/doc/oai_logo.png b/doc/images/oai_logo.png
similarity index 100%
rename from doc/oai_logo.png
rename to doc/images/oai_logo.png
diff --git a/doc/nr-ue-design.md b/doc/nr-ue-design.md
index 9ca95c1a00..1648e6b7c5 100644
--- a/doc/nr-ue-design.md
+++ b/doc/nr-ue-design.md
@@ -15,7 +15,7 @@ The UE exits when at any point in operation it gets out of synchronization. When
 
 UE uses actors which are threads dedicated to particular activity. Sync Actor handles initial sync. DL Actors handle DLSCH PHY procedures. UL procedures are are run on the UL Actor
 
-![design](nr-ue-threads.svg)
+![design](images/nr-ue-threads.svg)
 
 ## Initial Synchronization Block
 ```mermaid
diff --git a/doc/oai_enb_block_diagram.png b/doc/oai_enb_block_diagram.png
deleted file mode 100644
index 58c8eb9e95..0000000000
Binary files a/doc/oai_enb_block_diagram.png and /dev/null differ