diff --git a/engines/asylum/asylum.vcproj b/engines/asylum/asylum.vcproj
index 7fb1e4f8fe6..77a241e0223 100644
--- a/engines/asylum/asylum.vcproj
+++ b/engines/asylum/asylum.vcproj
@@ -184,30 +184,10 @@
 		<Filter
 			Name="resources"
 			>
-			<File
-				RelativePath="..\..\engines\asylum\resources\graphic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\asylum\resources\graphic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\asylum\resources\resource.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\engines\asylum\resources\resource.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\engines\asylum\resources\video.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\engines\asylum\resources\video.h"
-				>
-			</File>
 		</Filter>
 		<File
 			RelativePath="..\..\engines\asylum\asylum.cpp"
@@ -237,6 +217,14 @@
 			RelativePath="..\..\engines\asylum\screen.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\asylum\video.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\asylum\video.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/engines/asylum/bundles/bundle.cpp b/engines/asylum/bundle.cpp
similarity index 100%
rename from engines/asylum/bundles/bundle.cpp
rename to engines/asylum/bundle.cpp
diff --git a/engines/asylum/bundles/bundle.h b/engines/asylum/bundle.h
similarity index 97%
rename from engines/asylum/bundles/bundle.h
rename to engines/asylum/bundle.h
index 1946c424a0f..4f5fb9042f0 100644
--- a/engines/asylum/bundles/bundle.h
+++ b/engines/asylum/bundle.h
@@ -29,7 +29,7 @@
 #include "common/str.h"
 #include "common/array.h"
 
-#include "asylum/resources/resource.h"
+#include "asylum/resource.h"
 
 namespace Asylum {
 
diff --git a/engines/asylum/bundles/graphicbundle.cpp b/engines/asylum/graphicbundle.cpp
similarity index 100%
rename from engines/asylum/bundles/graphicbundle.cpp
rename to engines/asylum/graphicbundle.cpp
diff --git a/engines/asylum/bundles/graphicbundle.h b/engines/asylum/graphicbundle.h
similarity index 97%
rename from engines/asylum/bundles/graphicbundle.h
rename to engines/asylum/graphicbundle.h
index 41a92318d4a..c30683dc877 100644
--- a/engines/asylum/bundles/graphicbundle.h
+++ b/engines/asylum/graphicbundle.h
@@ -22,7 +22,7 @@
 #ifndef ASYLUM_GRAPHICBUNDLE_H_
 #define ASYLUM_GRAPHICBUNDLE_H_
 
-#include "asylum/bundles/bundle.h"
+#include "asylum/bundle.h"
 
 namespace Asylum {
 
diff --git a/engines/asylum/module.mk b/engines/asylum/module.mk
index 285f8f36092..217ebab11db 100644
--- a/engines/asylum/module.mk
+++ b/engines/asylum/module.mk
@@ -2,14 +2,12 @@ MODULE := engines/asylum
 
 MODULE_OBJS := \
 	asylum.o \
+	bundle.o \
 	detection.o \
+	graphicbundle.o \
+	movie.o \
 	resman.o \
-	screen.o \
-	bundles/bundle.o \
-	bundles/graphicbundle.o \
-	resources/resource.o \
-	resources/graphic.o \
-	resources/movie.o
+	screen.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_ASYLUM), DYNAMIC_PLUGIN)
diff --git a/engines/asylum/resman.h b/engines/asylum/resman.h
index cd404f556c0..a940e91a8af 100644
--- a/engines/asylum/resman.h
+++ b/engines/asylum/resman.h
@@ -25,8 +25,8 @@
 #include "common/str.h"
 #include "common/array.h"
 
-#include "asylum/bundles/bundle.h"
-#include "asylum/bundles/graphicbundle.h"
+#include "asylum/bundle.h"
+#include "asylum/graphicbundle.h"
 
 namespace Asylum {