diff --git a/radiantcore/CMakeLists.txt b/radiantcore/CMakeLists.txt
index 5cc2ba0ec6..a68b11f924 100644
--- a/radiantcore/CMakeLists.txt
+++ b/radiantcore/CMakeLists.txt
@@ -158,9 +158,9 @@ add_library(radiantcore MODULE
model/import/ModelImporterBase.cpp
model/picomodel/PicoModelLoader.cpp
model/picomodel/PicoModelModule.cpp
- model/picomodel/StaticModel.cpp
- model/picomodel/StaticModelNode.cpp
- model/picomodel/StaticModelSurface.cpp
+ model/StaticModel.cpp
+ model/StaticModelNode.cpp
+ model/StaticModelSurface.cpp
model/picomodel/lib/lwo/clip.c
model/picomodel/lib/lwo/envelope.c
model/picomodel/lib/lwo/list.c
diff --git a/radiantcore/model/picomodel/StaticModel.cpp b/radiantcore/model/StaticModel.cpp
similarity index 100%
rename from radiantcore/model/picomodel/StaticModel.cpp
rename to radiantcore/model/StaticModel.cpp
diff --git a/radiantcore/model/picomodel/StaticModel.h b/radiantcore/model/StaticModel.h
similarity index 100%
rename from radiantcore/model/picomodel/StaticModel.h
rename to radiantcore/model/StaticModel.h
diff --git a/radiantcore/model/picomodel/StaticModelNode.cpp b/radiantcore/model/StaticModelNode.cpp
similarity index 100%
rename from radiantcore/model/picomodel/StaticModelNode.cpp
rename to radiantcore/model/StaticModelNode.cpp
diff --git a/radiantcore/model/picomodel/StaticModelNode.h b/radiantcore/model/StaticModelNode.h
similarity index 100%
rename from radiantcore/model/picomodel/StaticModelNode.h
rename to radiantcore/model/StaticModelNode.h
diff --git a/radiantcore/model/picomodel/StaticModelSurface.cpp b/radiantcore/model/StaticModelSurface.cpp
similarity index 100%
rename from radiantcore/model/picomodel/StaticModelSurface.cpp
rename to radiantcore/model/StaticModelSurface.cpp
diff --git a/radiantcore/model/picomodel/StaticModelSurface.h b/radiantcore/model/StaticModelSurface.h
similarity index 98%
rename from radiantcore/model/picomodel/StaticModelSurface.h
rename to radiantcore/model/StaticModelSurface.h
index 5bf565590d..f6c8f7f3c5 100644
--- a/radiantcore/model/picomodel/StaticModelSurface.h
+++ b/radiantcore/model/StaticModelSurface.h
@@ -1,7 +1,7 @@
#pragma once
#include "GLProgramAttributes.h"
-#include "lib/picomodel.h"
+#include "picomodel/lib/picomodel.h"
#include "render.h"
#include "math/AABB.h"
diff --git a/radiantcore/model/import/AseModelLoader.cpp b/radiantcore/model/import/AseModelLoader.cpp
index ebb3d7247d..489dfad1b5 100644
--- a/radiantcore/model/import/AseModelLoader.cpp
+++ b/radiantcore/model/import/AseModelLoader.cpp
@@ -4,7 +4,7 @@
#include "os/path.h"
#include "string/case_conv.h"
-#include "../picomodel/StaticModel.h"
+#include "../StaticModel.h"
#include "../picomodel/PicoModelLoader.h"
extern "C"
diff --git a/radiantcore/model/import/ModelImporterBase.cpp b/radiantcore/model/import/ModelImporterBase.cpp
index 6550215101..f8a88cafc8 100644
--- a/radiantcore/model/import/ModelImporterBase.cpp
+++ b/radiantcore/model/import/ModelImporterBase.cpp
@@ -5,8 +5,8 @@
#include "imodelcache.h"
#include "string/case_conv.h"
#include "os/path.h"
-#include "../picomodel/StaticModelNode.h"
-#include "../picomodel/StaticModel.h"
+#include "../StaticModelNode.h"
+#include "../StaticModel.h"
namespace model
{
diff --git a/radiantcore/model/picomodel/PicoModelLoader.cpp b/radiantcore/model/picomodel/PicoModelLoader.cpp
index 08249d9e57..30f931ff5b 100644
--- a/radiantcore/model/picomodel/PicoModelLoader.cpp
+++ b/radiantcore/model/picomodel/PicoModelLoader.cpp
@@ -10,8 +10,8 @@
#include "idatastream.h"
#include "string/case_conv.h"
-#include "StaticModel.h"
-#include "StaticModelSurface.h"
+#include "../StaticModel.h"
+#include "../StaticModelSurface.h"
namespace model {
diff --git a/radiantcore/model/picomodel/PicoModelLoader.h b/radiantcore/model/picomodel/PicoModelLoader.h
index 6125ad97ad..6069b093be 100644
--- a/radiantcore/model/picomodel/PicoModelLoader.h
+++ b/radiantcore/model/picomodel/PicoModelLoader.h
@@ -1,7 +1,7 @@
#pragma once
#include "../import/ModelImporterBase.h"
-#include "StaticModel.h"
+#include "../StaticModel.h"
typedef struct picoModule_s picoModule_t;
typedef struct picoSurface_s picoSurface_t;
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index 4fc057f7e8..3ad885b6c5 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -581,9 +581,9 @@
-
-
-
+
+
+
@@ -897,9 +897,9 @@
-
-
-
+
+
+
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index 344adcb899..b587873242 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -994,15 +994,6 @@
src\eclass
-
- src\model\picomodel
-
-
- src\model\picomodel
-
-
- src\model\picomodel
-
src\rendersystem
@@ -1036,6 +1027,15 @@
src\model\import
+
+ src\model
+
+
+ src\model
+
+
+ src\model
+
@@ -2058,15 +2058,6 @@
src\eclass
-
- src\model\picomodel
-
-
- src\model\picomodel
-
-
- src\model\picomodel
-
src\rendersystem
@@ -2112,5 +2103,14 @@
src\model\import
+
+ src\model
+
+
+ src\model
+
+
+ src\model
+
\ No newline at end of file