diff --git a/dll/appticket.h b/dll/dll/appticket.h
similarity index 100%
rename from dll/appticket.h
rename to dll/dll/appticket.h
diff --git a/dll/auth.h b/dll/dll/auth.h
similarity index 100%
rename from dll/auth.h
rename to dll/dll/auth.h
diff --git a/dll/base.h b/dll/dll/base.h
similarity index 100%
rename from dll/base.h
rename to dll/dll/base.h
diff --git a/dll/common_includes.h b/dll/dll/common_includes.h
similarity index 98%
rename from dll/common_includes.h
rename to dll/dll/common_includes.h
index cf7cf452..98e0e939 100644
--- a/dll/common_includes.h
+++ b/dll/dll/common_includes.h
@@ -95,7 +95,7 @@
 
     #ifdef EMU_EXPERIMENTAL_BUILD
         #include <winhttp.h>
-        #include "../detours/detours.h"
+        #include "detours/detours.h"
     #endif
 
 // Convert a wide Unicode string to an UTF8 string
@@ -161,9 +161,9 @@ static inline void reset_LastError()
 #include "controller/gamepad.h"
 
 // Steamsdk includes
-#include "sdk_includes/steam_api.h"
-#include "sdk_includes/steam_gameserver.h"
-#include "sdk_includes/steamdatagram_tickets.h"
+#include "steam/steam_api.h"
+#include "steam/steam_gameserver.h"
+#include "steam/steamdatagram_tickets.h"
 
 // PRINT_DEBUG definition
 // notice the extra call to WSASetLastError(0) in Windows def
diff --git a/dll/dll.h b/dll/dll/dll.h
similarity index 100%
rename from dll/dll.h
rename to dll/dll/dll.h
diff --git a/dll/local_storage.h b/dll/dll/local_storage.h
similarity index 100%
rename from dll/local_storage.h
rename to dll/dll/local_storage.h
diff --git a/dll/network.h b/dll/dll/network.h
similarity index 100%
rename from dll/network.h
rename to dll/dll/network.h
diff --git a/dll/settings.h b/dll/dll/settings.h
similarity index 100%
rename from dll/settings.h
rename to dll/dll/settings.h
diff --git a/dll/settings_parser.h b/dll/dll/settings_parser.h
similarity index 100%
rename from dll/settings_parser.h
rename to dll/dll/settings_parser.h
diff --git a/dll/source_query.h b/dll/dll/source_query.h
similarity index 100%
rename from dll/source_query.h
rename to dll/dll/source_query.h
diff --git a/dll/steam_HTMLsurface.h b/dll/dll/steam_HTMLsurface.h
similarity index 100%
rename from dll/steam_HTMLsurface.h
rename to dll/dll/steam_HTMLsurface.h
diff --git a/dll/steam_applist.h b/dll/dll/steam_applist.h
similarity index 100%
rename from dll/steam_applist.h
rename to dll/dll/steam_applist.h
diff --git a/dll/steam_apps.h b/dll/dll/steam_apps.h
similarity index 100%
rename from dll/steam_apps.h
rename to dll/dll/steam_apps.h
diff --git a/dll/steam_client.h b/dll/dll/steam_client.h
similarity index 99%
rename from dll/steam_client.h
rename to dll/dll/steam_client.h
index d00cb6ae..4baba763 100644
--- a/dll/steam_client.h
+++ b/dll/dll/steam_client.h
@@ -51,7 +51,7 @@
 #include "steam_gameserverstats.h"
 #include "steam_masterserver_updater.h"
 
-#include "../overlay_experimental/steam_overlay.h"
+#include "overlay_experimental/steam_overlay.h"
 
 enum Steam_Pipe {
     NO_USER,
diff --git a/dll/steam_controller.h b/dll/dll/steam_controller.h
similarity index 100%
rename from dll/steam_controller.h
rename to dll/dll/steam_controller.h
diff --git a/dll/steam_friends.h b/dll/dll/steam_friends.h
similarity index 99%
rename from dll/steam_friends.h
rename to dll/dll/steam_friends.h
index 6313f3cc..3b2ae8eb 100644
--- a/dll/steam_friends.h
+++ b/dll/dll/steam_friends.h
@@ -19,7 +19,7 @@
 #define __INCLUDED_STEAM_FRIENDS_H__
 
 #include "base.h"
-#include "../overlay_experimental/steam_overlay.h"
+#include "overlay_experimental/steam_overlay.h"
 
 #define SEND_FRIEND_RATE 4.0
 
diff --git a/dll/steam_game_coordinator.h b/dll/dll/steam_game_coordinator.h
similarity index 100%
rename from dll/steam_game_coordinator.h
rename to dll/dll/steam_game_coordinator.h
diff --git a/dll/steam_gamesearch.h b/dll/dll/steam_gamesearch.h
similarity index 100%
rename from dll/steam_gamesearch.h
rename to dll/dll/steam_gamesearch.h
diff --git a/dll/steam_gameserver.h b/dll/dll/steam_gameserver.h
similarity index 100%
rename from dll/steam_gameserver.h
rename to dll/dll/steam_gameserver.h
diff --git a/dll/steam_gameserverstats.h b/dll/dll/steam_gameserverstats.h
similarity index 100%
rename from dll/steam_gameserverstats.h
rename to dll/dll/steam_gameserverstats.h
diff --git a/dll/steam_http.h b/dll/dll/steam_http.h
similarity index 100%
rename from dll/steam_http.h
rename to dll/dll/steam_http.h
diff --git a/dll/steam_inventory.h b/dll/dll/steam_inventory.h
similarity index 100%
rename from dll/steam_inventory.h
rename to dll/dll/steam_inventory.h
diff --git a/dll/steam_masterserver_updater.h b/dll/dll/steam_masterserver_updater.h
similarity index 100%
rename from dll/steam_masterserver_updater.h
rename to dll/dll/steam_masterserver_updater.h
diff --git a/dll/steam_matchmaking.h b/dll/dll/steam_matchmaking.h
similarity index 100%
rename from dll/steam_matchmaking.h
rename to dll/dll/steam_matchmaking.h
diff --git a/dll/steam_matchmaking_servers.h b/dll/dll/steam_matchmaking_servers.h
similarity index 100%
rename from dll/steam_matchmaking_servers.h
rename to dll/dll/steam_matchmaking_servers.h
diff --git a/dll/steam_music.h b/dll/dll/steam_music.h
similarity index 100%
rename from dll/steam_music.h
rename to dll/dll/steam_music.h
diff --git a/dll/steam_musicremote.h b/dll/dll/steam_musicremote.h
similarity index 100%
rename from dll/steam_musicremote.h
rename to dll/dll/steam_musicremote.h
diff --git a/dll/steam_networking.h b/dll/dll/steam_networking.h
similarity index 100%
rename from dll/steam_networking.h
rename to dll/dll/steam_networking.h
diff --git a/dll/steam_networking_messages.h b/dll/dll/steam_networking_messages.h
similarity index 100%
rename from dll/steam_networking_messages.h
rename to dll/dll/steam_networking_messages.h
diff --git a/dll/steam_networking_sockets.h b/dll/dll/steam_networking_sockets.h
similarity index 100%
rename from dll/steam_networking_sockets.h
rename to dll/dll/steam_networking_sockets.h
diff --git a/dll/steam_networking_socketsserialized.h b/dll/dll/steam_networking_socketsserialized.h
similarity index 100%
rename from dll/steam_networking_socketsserialized.h
rename to dll/dll/steam_networking_socketsserialized.h
diff --git a/dll/steam_networking_utils.h b/dll/dll/steam_networking_utils.h
similarity index 100%
rename from dll/steam_networking_utils.h
rename to dll/dll/steam_networking_utils.h
diff --git a/dll/steam_parental.h b/dll/dll/steam_parental.h
similarity index 100%
rename from dll/steam_parental.h
rename to dll/dll/steam_parental.h
diff --git a/dll/steam_parties.h b/dll/dll/steam_parties.h
similarity index 100%
rename from dll/steam_parties.h
rename to dll/dll/steam_parties.h
diff --git a/dll/steam_remote_storage.h b/dll/dll/steam_remote_storage.h
similarity index 100%
rename from dll/steam_remote_storage.h
rename to dll/dll/steam_remote_storage.h
diff --git a/dll/steam_remoteplay.h b/dll/dll/steam_remoteplay.h
similarity index 100%
rename from dll/steam_remoteplay.h
rename to dll/dll/steam_remoteplay.h
diff --git a/dll/steam_screenshots.h b/dll/dll/steam_screenshots.h
similarity index 100%
rename from dll/steam_screenshots.h
rename to dll/dll/steam_screenshots.h
diff --git a/dll/steam_tv.h b/dll/dll/steam_tv.h
similarity index 100%
rename from dll/steam_tv.h
rename to dll/dll/steam_tv.h
diff --git a/dll/steam_ugc.h b/dll/dll/steam_ugc.h
similarity index 100%
rename from dll/steam_ugc.h
rename to dll/dll/steam_ugc.h
diff --git a/dll/steam_unified_messages.h b/dll/dll/steam_unified_messages.h
similarity index 100%
rename from dll/steam_unified_messages.h
rename to dll/dll/steam_unified_messages.h
diff --git a/dll/steam_user.h b/dll/dll/steam_user.h
similarity index 100%
rename from dll/steam_user.h
rename to dll/dll/steam_user.h
diff --git a/dll/steam_user_stats.h b/dll/dll/steam_user_stats.h
similarity index 99%
rename from dll/steam_user_stats.h
rename to dll/dll/steam_user_stats.h
index 2db556c3..3d69b269 100644
--- a/dll/steam_user_stats.h
+++ b/dll/dll/steam_user_stats.h
@@ -20,7 +20,7 @@
 
 #include <limits>
 #include "base.h"
-#include "../overlay_experimental/steam_overlay.h"
+#include "overlay_experimental/steam_overlay.h"
 
 struct Steam_Leaderboard_Score {
     CSteamID steam_id;
diff --git a/dll/steam_utils.h b/dll/dll/steam_utils.h
similarity index 99%
rename from dll/steam_utils.h
rename to dll/dll/steam_utils.h
index ca15d523..fc868b2e 100644
--- a/dll/steam_utils.h
+++ b/dll/dll/steam_utils.h
@@ -17,7 +17,7 @@
 
 #include "base.h"
 #include "local_storage.h"
-#include "../overlay_experimental/steam_overlay.h"
+#include "overlay_experimental/steam_overlay.h"
 
 static std::chrono::time_point<std::chrono::steady_clock> app_initialized_time = std::chrono::steady_clock::now();
 
diff --git a/dll/steam_video.h b/dll/dll/steam_video.h
similarity index 100%
rename from dll/steam_video.h
rename to dll/dll/steam_video.h