diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.cpp
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.cpp
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.cpp
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.h
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataDef.h
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.cpp
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.cpp
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataEnum.h
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataEnum.h
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.cpp
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataStruct.h
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.cpp b/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.cpp
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.cpp
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.cpp
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.h b/src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h
similarity index 100%
rename from src/ObjLoading/Parsing/StructuredDataDef/Domain/CommonStructuredDataTypes.h
rename to src/ObjCommon/StructuredDataDef/CommonStructuredDataTypes.h
diff --git a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h
index a6e22084..70dce1ca 100644
--- a/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h
+++ b/src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderStructuredDataDefSet.h
@@ -2,7 +2,7 @@
 
 #include "Game/IW4/IW4.h"
 #include "AssetLoading/BasicAssetLoader.h"
-#include "Parsing/StructuredDataDef/Domain/CommonStructuredDataDef.h"
+#include "StructuredDataDef/CommonStructuredDataDef.h"
 #include "SearchPath/ISearchPath.h"
 
 namespace IW4
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h
index 5a559321..cf45b1a4 100644
--- a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h
+++ b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParser.h
@@ -2,7 +2,7 @@
 
 #include "Utils/ClassUtils.h"
 #include "StructuredDataDefParserState.h"
-#include "Domain/CommonStructuredDataDef.h"
+#include "StructuredDataDef/CommonStructuredDataDef.h"
 #include "Parsing/Simple/SimpleLexer.h"
 #include "Parsing/Simple/SimpleParserValue.h"
 #include "Parsing/Impl/AbstractParser.h"
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h
index 01b42a7d..2d60aa5d 100644
--- a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h
+++ b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefParserState.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <cstddef>
 
-#include "Domain/CommonStructuredDataDef.h"
+#include "StructuredDataDef/CommonStructuredDataDef.h"
 
 namespace sdd
 {
diff --git a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h
index bc4c2d1e..34e1162f 100644
--- a/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h
+++ b/src/ObjLoading/Parsing/StructuredDataDef/StructuredDataDefReader.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "Domain/CommonStructuredDataDef.h"
+#include "StructuredDataDef/CommonStructuredDataDef.h"
 #include "Parsing/IParserLineStream.h"
 
 class StructuredDataDefReader