diff --git a/radiantcore/CMakeLists.txt b/radiantcore/CMakeLists.txt
index 3ac4359eea..5cc2ba0ec6 100644
--- a/radiantcore/CMakeLists.txt
+++ b/radiantcore/CMakeLists.txt
@@ -154,8 +154,8 @@ add_library(radiantcore MODULE
model/ModelFormatManager.cpp
model/NullModel.cpp
model/NullModelNode.cpp
- model/picomodel/AseModelLoader.cpp
- model/picomodel/ModelImporterBase.cpp
+ model/import/AseModelLoader.cpp
+ model/import/ModelImporterBase.cpp
model/picomodel/PicoModelLoader.cpp
model/picomodel/PicoModelModule.cpp
model/picomodel/StaticModel.cpp
diff --git a/radiantcore/model/picomodel/AseModelLoader.cpp b/radiantcore/model/import/AseModelLoader.cpp
similarity index 92%
rename from radiantcore/model/picomodel/AseModelLoader.cpp
rename to radiantcore/model/import/AseModelLoader.cpp
index 266bc14bb8..ebb3d7247d 100644
--- a/radiantcore/model/picomodel/AseModelLoader.cpp
+++ b/radiantcore/model/import/AseModelLoader.cpp
@@ -1,11 +1,11 @@
#include "AseModelLoader.h"
-#include "lib/picomodel.h"
+#include "../picomodel/lib/picomodel.h"
#include "os/path.h"
#include "string/case_conv.h"
-#include "StaticModel.h"
-#include "PicoModelLoader.h"
+#include "../picomodel/StaticModel.h"
+#include "../picomodel/PicoModelLoader.h"
extern "C"
{
diff --git a/radiantcore/model/picomodel/AseModelLoader.h b/radiantcore/model/import/AseModelLoader.h
similarity index 100%
rename from radiantcore/model/picomodel/AseModelLoader.h
rename to radiantcore/model/import/AseModelLoader.h
diff --git a/radiantcore/model/picomodel/ModelImporterBase.cpp b/radiantcore/model/import/ModelImporterBase.cpp
similarity index 95%
rename from radiantcore/model/picomodel/ModelImporterBase.cpp
rename to radiantcore/model/import/ModelImporterBase.cpp
index d127a0d2a4..6550215101 100644
--- a/radiantcore/model/picomodel/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 "StaticModelNode.h"
-#include "StaticModel.h"
+#include "../picomodel/StaticModelNode.h"
+#include "../picomodel/StaticModel.h"
namespace model
{
diff --git a/radiantcore/model/picomodel/ModelImporterBase.h b/radiantcore/model/import/ModelImporterBase.h
similarity index 100%
rename from radiantcore/model/picomodel/ModelImporterBase.h
rename to radiantcore/model/import/ModelImporterBase.h
diff --git a/radiantcore/model/picomodel/PicoModelLoader.h b/radiantcore/model/picomodel/PicoModelLoader.h
index 81532ce072..6125ad97ad 100644
--- a/radiantcore/model/picomodel/PicoModelLoader.h
+++ b/radiantcore/model/picomodel/PicoModelLoader.h
@@ -1,6 +1,6 @@
#pragma once
-#include "ModelImporterBase.h"
+#include "../import/ModelImporterBase.h"
#include "StaticModel.h"
typedef struct picoModule_s picoModule_t;
diff --git a/radiantcore/model/picomodel/PicoModelModule.h b/radiantcore/model/picomodel/PicoModelModule.h
index 2b7c31602b..0391e5af45 100644
--- a/radiantcore/model/picomodel/PicoModelModule.h
+++ b/radiantcore/model/picomodel/PicoModelModule.h
@@ -13,7 +13,7 @@
#include "string/case_conv.h"
#include "PicoModelLoader.h"
-#include "AseModelLoader.h"
+#include "../import/AseModelLoader.h"
namespace model
{
diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
index ffdcd32943..4fc057f7e8 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj
+++ b/tools/msvc/DarkRadiantCore.vcxproj
@@ -151,6 +151,8 @@
+
+
@@ -163,7 +165,6 @@
-
CompileAsC
CompileAsC
@@ -578,7 +579,6 @@
-
@@ -875,6 +875,8 @@
+
+
@@ -889,12 +891,10 @@
-
-
diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
index 6f765cd692..344adcb899 100644
--- a/tools/msvc/DarkRadiantCore.vcxproj.filters
+++ b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -197,6 +197,9 @@
{b7afddd6-8c82-4975-a947-00999bd70fec}
+
+ {a98a0273-a99f-4a0d-b181-14479a01cecd}
+
@@ -1027,11 +1030,11 @@
src\shaders
-
- src\model\picomodel
+
+ src\model\import
-
- src\model\picomodel
+
+ src\model\import
@@ -2103,11 +2106,11 @@
src\shaders
-
- src\model\picomodel
+
+ src\model\import
-
- src\model\picomodel
+
+ src\model\import
\ No newline at end of file