diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index c5f307eae9..3b12b36c40 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -87,14 +87,14 @@ set(3D-VIEWER_SRCS
     3d_rendering/trackball.cpp
     3d_viewer/3d_menubar.cpp
     3d_viewer/3d_toolbar.cpp
-    3d_viewer/dialogs/panel_3D_colors.cpp
-    3d_viewer/dialogs/panel_3D_colors_base.cpp
-    3d_viewer/dialogs/panel_3D_display_options.cpp
-    3d_viewer/dialogs/panel_3D_display_options_base.cpp
-    3d_viewer/dialogs/panel_3D_opengl_options.cpp
-    3d_viewer/dialogs/panel_3D_opengl_options_base.cpp
-    3d_viewer/dialogs/panel_3D_raytracing_options.cpp
-    3d_viewer/dialogs/panel_3D_raytracing_options_base.cpp
+    dialogs/panel_3D_colors.cpp
+    dialogs/panel_3D_colors_base.cpp
+    dialogs/panel_3D_display_options.cpp
+    dialogs/panel_3D_display_options_base.cpp
+    dialogs/panel_3D_opengl_options.cpp
+    dialogs/panel_3D_opengl_options_base.cpp
+    dialogs/panel_3D_raytracing_options.cpp
+    dialogs/panel_3D_raytracing_options_base.cpp
     3d_viewer/tools/eda_3d_actions.cpp
     3d_viewer/tools/eda_3d_conditions.cpp
     3d_viewer/tools/eda_3d_controller.cpp
diff --git a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp b/3d-viewer/dialogs/3d_cache_dialogs.cpp
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp
rename to 3d-viewer/dialogs/3d_cache_dialogs.cpp
diff --git a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h b/3d-viewer/dialogs/3d_cache_dialogs.h
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
rename to 3d-viewer/dialogs/3d_cache_dialogs.h
diff --git a/3d-viewer/3d_cache/dialogs/dialog_select_3d_model.cpp b/3d-viewer/dialogs/dialog_select_3d_model.cpp
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/dialog_select_3d_model.cpp
rename to 3d-viewer/dialogs/dialog_select_3d_model.cpp
diff --git a/3d-viewer/3d_cache/dialogs/dialog_select_3d_model.h b/3d-viewer/dialogs/dialog_select_3d_model.h
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/dialog_select_3d_model.h
rename to 3d-viewer/dialogs/dialog_select_3d_model.h
diff --git a/3d-viewer/3d_cache/dialogs/dialog_select_3d_model_base.cpp b/3d-viewer/dialogs/dialog_select_3d_model_base.cpp
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/dialog_select_3d_model_base.cpp
rename to 3d-viewer/dialogs/dialog_select_3d_model_base.cpp
diff --git a/3d-viewer/3d_cache/dialogs/dialog_select_3d_model_base.fbp b/3d-viewer/dialogs/dialog_select_3d_model_base.fbp
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/dialog_select_3d_model_base.fbp
rename to 3d-viewer/dialogs/dialog_select_3d_model_base.fbp
diff --git a/3d-viewer/3d_cache/dialogs/dialog_select_3d_model_base.h b/3d-viewer/dialogs/dialog_select_3d_model_base.h
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/dialog_select_3d_model_base.h
rename to 3d-viewer/dialogs/dialog_select_3d_model_base.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp b/3d-viewer/dialogs/panel_3D_colors.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_colors.cpp
rename to 3d-viewer/dialogs/panel_3D_colors.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors.h b/3d-viewer/dialogs/panel_3D_colors.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_colors.h
rename to 3d-viewer/dialogs/panel_3D_colors.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.cpp b/3d-viewer/dialogs/panel_3D_colors_base.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.cpp
rename to 3d-viewer/dialogs/panel_3D_colors_base.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.fbp b/3d-viewer/dialogs/panel_3D_colors_base.fbp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.fbp
rename to 3d-viewer/dialogs/panel_3D_colors_base.fbp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.h b/3d-viewer/dialogs/panel_3D_colors_base.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_colors_base.h
rename to 3d-viewer/dialogs/panel_3D_colors_base.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp b/3d-viewer/dialogs/panel_3D_display_options.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_display_options.cpp
rename to 3d-viewer/dialogs/panel_3D_display_options.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h b/3d-viewer/dialogs/panel_3D_display_options.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_display_options.h
rename to 3d-viewer/dialogs/panel_3D_display_options.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options_base.cpp b/3d-viewer/dialogs/panel_3D_display_options_base.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_display_options_base.cpp
rename to 3d-viewer/dialogs/panel_3D_display_options_base.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options_base.fbp b/3d-viewer/dialogs/panel_3D_display_options_base.fbp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_display_options_base.fbp
rename to 3d-viewer/dialogs/panel_3D_display_options_base.fbp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_display_options_base.h b/3d-viewer/dialogs/panel_3D_display_options_base.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_display_options_base.h
rename to 3d-viewer/dialogs/panel_3D_display_options_base.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp b/3d-viewer/dialogs/panel_3D_opengl_options.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.cpp
rename to 3d-viewer/dialogs/panel_3D_opengl_options.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h b/3d-viewer/dialogs/panel_3D_opengl_options.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options.h
rename to 3d-viewer/dialogs/panel_3D_opengl_options.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.cpp b/3d-viewer/dialogs/panel_3D_opengl_options_base.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.cpp
rename to 3d-viewer/dialogs/panel_3D_opengl_options_base.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.fbp b/3d-viewer/dialogs/panel_3D_opengl_options_base.fbp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.fbp
rename to 3d-viewer/dialogs/panel_3D_opengl_options_base.fbp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.h b/3d-viewer/dialogs/panel_3D_opengl_options_base.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_opengl_options_base.h
rename to 3d-viewer/dialogs/panel_3D_opengl_options_base.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp b/3d-viewer/dialogs/panel_3D_raytracing_options.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.cpp
rename to 3d-viewer/dialogs/panel_3D_raytracing_options.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h b/3d-viewer/dialogs/panel_3D_raytracing_options.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options.h
rename to 3d-viewer/dialogs/panel_3D_raytracing_options.h
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.cpp b/3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.cpp
rename to 3d-viewer/dialogs/panel_3D_raytracing_options_base.cpp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.fbp b/3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.fbp
rename to 3d-viewer/dialogs/panel_3D_raytracing_options_base.fbp
diff --git a/3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.h b/3d-viewer/dialogs/panel_3D_raytracing_options_base.h
similarity index 100%
rename from 3d-viewer/3d_viewer/dialogs/panel_3D_raytracing_options_base.h
rename to 3d-viewer/dialogs/panel_3D_raytracing_options_base.h
diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model.cpp b/3d-viewer/dialogs/panel_preview_3d_model.cpp
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/panel_preview_3d_model.cpp
rename to 3d-viewer/dialogs/panel_preview_3d_model.cpp
diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model.h b/3d-viewer/dialogs/panel_preview_3d_model.h
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/panel_preview_3d_model.h
rename to 3d-viewer/dialogs/panel_preview_3d_model.h
diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.cpp b/3d-viewer/dialogs/panel_preview_3d_model_base.cpp
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.cpp
rename to 3d-viewer/dialogs/panel_preview_3d_model_base.cpp
diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.fbp b/3d-viewer/dialogs/panel_preview_3d_model_base.fbp
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.fbp
rename to 3d-viewer/dialogs/panel_preview_3d_model_base.fbp
diff --git a/3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.h b/3d-viewer/dialogs/panel_preview_3d_model_base.h
similarity index 100%
rename from 3d-viewer/3d_cache/dialogs/panel_preview_3d_model_base.h
rename to 3d-viewer/dialogs/panel_preview_3d_model_base.h
diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp
index 1dda401fb7..f622b0d672 100644
--- a/pcbnew/dialogs/dialog_footprint_properties.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties.cpp
@@ -43,8 +43,8 @@
 
 #include <panel_fp_properties_3d_model.h>
 
-#include "3d_cache/dialogs/3d_cache_dialogs.h"
-#include "3d_cache/dialogs/panel_preview_3d_model.h"
+#include "dialogs/3d_cache_dialogs.h"
+#include "dialogs/panel_preview_3d_model.h"
 
 #include <dialog_footprint_properties.h>
 
diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
index f50b350a64..105d633f69 100644
--- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
+++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp
@@ -42,8 +42,8 @@
 #include "3d_rendering/legacy/3d_model.h"
 #include "filename_resolver.h"
 #include <pgm_base.h>
-#include "3d_cache/dialogs/panel_preview_3d_model.h"
-#include "3d_cache/dialogs/3d_cache_dialogs.h"
+#include "dialogs/panel_preview_3d_model.h"
+#include "dialogs/3d_cache_dialogs.h"
 #include <settings/settings_manager.h>
 #include <tool/tool_manager.h>
 #include <tools/pcb_selection_tool.h>
diff --git a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp
index 0d4b0d2fdb..44c48bd82b 100644
--- a/pcbnew/dialogs/panel_fp_properties_3d_model.cpp
+++ b/pcbnew/dialogs/panel_fp_properties_3d_model.cpp
@@ -39,8 +39,8 @@
 #include <dialog_footprint_properties_fp_editor.h>
 #include "filename_resolver.h"
 #include <pgm_base.h>
-#include "3d_cache/dialogs/panel_preview_3d_model.h"
-#include "3d_cache/dialogs/3d_cache_dialogs.h"
+#include "dialogs/panel_preview_3d_model.h"
+#include "dialogs/3d_cache_dialogs.h"
 #include <settings/settings_manager.h>
 #include <kiway_holder.h>
 #include <wx/defs.h>