diff --git a/media/xbox1/Thumbs.db b/media/xbox1/Thumbs.db
new file mode 100644
index 0000000000..a443c13b09
Binary files /dev/null and b/media/xbox1/Thumbs.db differ
diff --git a/xbox1/Media/main-menu_480p.png b/media/xbox1/main-menu_480p.png
similarity index 100%
rename from xbox1/Media/main-menu_480p.png
rename to media/xbox1/main-menu_480p.png
diff --git a/xbox1/Media/main-menu_720p.png b/media/xbox1/main-menu_720p.png
similarity index 100%
rename from xbox1/Media/main-menu_720p.png
rename to media/xbox1/main-menu_720p.png
diff --git a/xbox1/Media/menuMainRomSelectPanel.png b/media/xbox1/menuMainRomSelectPanel.png
similarity index 100%
rename from xbox1/Media/menuMainRomSelectPanel.png
rename to media/xbox1/menuMainRomSelectPanel.png
diff --git a/xbox1/Media/titleimage.jpg b/media/xbox1/titleimage.jpg
similarity index 100%
rename from xbox1/Media/titleimage.jpg
rename to media/xbox1/titleimage.jpg
diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
index 12b58ba2ff..726b6ccaf3 100644
--- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
+++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
@@ -52,7 +52,7 @@
 			<Tool
 				Name="XboxDeploymentTool"
 				RemotePath="xe:\$(SolutionName)\CORE.xbe"
-				AdditionalFiles="..\..\xbox1\Media;roms;system;screenshots"
+				AdditionalFiles="..\..\media\xbox1;roms;system;screenshots"
 				ForceCopy="TRUE"/>
 			<Tool
 				Name="XboxImageTool"
@@ -106,7 +106,7 @@
 			<Tool
 				Name="XboxDeploymentTool"
 				RemotePath="xe:\$(SolutionName)\CORE.xbe"
-				AdditionalFiles="..\..\xbox1\Media;roms;system;screenshots"
+				AdditionalFiles="..\..\media\xbox1;roms;system;screenshots"
 				ForceCopy="TRUE"/>
 			<Tool
 				Name="XboxImageTool"
@@ -162,7 +162,7 @@
 			<Tool
 				Name="XboxDeploymentTool"
 				RemotePath="xe:\$(SolutionName)\CORE.xbe"
-				AdditionalFiles="..\..\xbox1\Media;roms;system;screenshots"
+				AdditionalFiles="..\..\media\xbox1;roms;system;screenshots"
 				ForceCopy="TRUE"/>
 			<Tool
 				Name="XboxImageTool"
@@ -222,7 +222,7 @@
 			<Tool
 				Name="XboxDeploymentTool"
 				RemotePath="xe:\$(SolutionName)\CORE.xbe"
-				AdditionalFiles="..\..\xbox1\Media;roms;system;screenshots"
+				AdditionalFiles="..\..\media\xbox1;roms;system;screenshots"
 				ForceCopy="TRUE"/>
 			<Tool
 				Name="XboxImageTool"
@@ -275,7 +275,7 @@
 			<Tool
 				Name="XboxDeploymentTool"
 				RemotePath="xe:\$(SolutionName)\CORE.xbe"
-				AdditionalFiles="..\..\xbox1\Media;roms;system;screenshots"
+				AdditionalFiles="..\..\media\xbox1;roms;system;screenshots"
 				ForceCopy="TRUE"/>
 			<Tool
 				Name="XboxImageTool"