diff --git a/demboyz/conlogwriter.cpp b/demboyz/conlogwriter.cpp
index 30b4f5b..ed9f467 100644
--- a/demboyz/conlogwriter.cpp
+++ b/demboyz/conlogwriter.cpp
@@ -1,7 +1,7 @@
 
 #include "idemowriter.h"
 #include "netmessages/nethandlers.h"
-#include "demotypes.h"
+#include "demofile/demotypes.h"
 #include <cstdio>
 
 class ConLogWriter: public IDemoWriter
diff --git a/demboyz/demofile.cpp b/demboyz/demofile/demofile.cpp
similarity index 100%
rename from demboyz/demofile.cpp
rename to demboyz/demofile/demofile.cpp
diff --git a/demboyz/demofile.h b/demboyz/demofile/demofile.h
similarity index 100%
rename from demboyz/demofile.h
rename to demboyz/demofile/demofile.h
diff --git a/demboyz/demotypes.h b/demboyz/demofile/demotypes.h
similarity index 100%
rename from demboyz/demotypes.h
rename to demboyz/demofile/demotypes.h
diff --git a/demboyz/demowriter.cpp b/demboyz/demowriter.cpp
index 129143e..2129dbd 100644
--- a/demboyz/demowriter.cpp
+++ b/demboyz/demowriter.cpp
@@ -1,7 +1,7 @@
 
 #include "idemowriter.h"
-#include "demotypes.h"
-#include "demofile.h"
+#include "demofile/demotypes.h"
+#include "demofile/demofile.h"
 #include "netmessages/nethandlers.h"
 #include "netmessages/netcontants.h"
 #include "sourcesdk/bitbuf.h"
diff --git a/demboyz/demreader.cpp b/demboyz/demreader.cpp
index c7005be..6aa2b0a 100644
--- a/demboyz/demreader.cpp
+++ b/demboyz/demreader.cpp
@@ -1,8 +1,8 @@
 
 #include "demoreader.h"
 #include "idemowriter.h"
-#include "demofile.h"
-#include "demotypes.h"
+#include "demofile/demofile.h"
+#include "demofile/demotypes.h"
 
 #include "netmessages/netmessages.h"
 #include "netmessages/netcontants.h"
diff --git a/premake/premake5.lua b/premake/premake5.lua
index f514921..28fc3e8 100644
--- a/premake/premake5.lua
+++ b/premake/premake5.lua
@@ -17,10 +17,8 @@ solution "demboyz"
         language "C++"
         files
         {
-            "../demboyz/*.h",
-            "../demboyz/*.cpp",
-            "../demboyz/netmessages/*.h",
-            "../demboyz/netmessages/*.cpp",
+            "../demboyz/**.h",
+            "../demboyz/**.cpp",
             "../external/sourcesdk/*.h",
             "../external/sourcesdk/*.cpp"
         }