diff --git a/reactos/dll/directx/ddraw/iface_clipper.c b/reactos/dll/directx/ddraw/Clipper/iface_clipper.c
similarity index 100%
rename from reactos/dll/directx/ddraw/iface_clipper.c
rename to reactos/dll/directx/ddraw/Clipper/iface_clipper.c
diff --git a/reactos/dll/directx/ddraw/iface_color.c b/reactos/dll/directx/ddraw/Color/iface_color.c
similarity index 100%
rename from reactos/dll/directx/ddraw/iface_color.c
rename to reactos/dll/directx/ddraw/Color/iface_color.c
diff --git a/reactos/dll/directx/ddraw/callbacks_hel.c b/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c
similarity index 100%
rename from reactos/dll/directx/ddraw/callbacks_hel.c
rename to reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c
diff --git a/reactos/dll/directx/ddraw/main/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
similarity index 100%
rename from reactos/dll/directx/ddraw/main/ddraw_main.c
rename to reactos/dll/directx/ddraw/Ddraw/ddraw_main.c
diff --git a/reactos/dll/directx/ddraw/iface_gamma.c b/reactos/dll/directx/ddraw/Gamma/iface_gamma.c
similarity index 100%
rename from reactos/dll/directx/ddraw/iface_gamma.c
rename to reactos/dll/directx/ddraw/Gamma/iface_gamma.c
diff --git a/reactos/dll/directx/ddraw/iface_kernel.c b/reactos/dll/directx/ddraw/Kernel/iface_kernel.c
similarity index 100%
rename from reactos/dll/directx/ddraw/iface_kernel.c
rename to reactos/dll/directx/ddraw/Kernel/iface_kernel.c
diff --git a/reactos/dll/directx/ddraw/iface_palette.c b/reactos/dll/directx/ddraw/Palette/iface_palette.c
similarity index 100%
rename from reactos/dll/directx/ddraw/iface_palette.c
rename to reactos/dll/directx/ddraw/Palette/iface_palette.c
diff --git a/reactos/dll/directx/ddraw/callbacks_surf_hel.c b/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
similarity index 100%
rename from reactos/dll/directx/ddraw/callbacks_surf_hel.c
rename to reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
diff --git a/reactos/dll/directx/ddraw/createsurface.c b/reactos/dll/directx/ddraw/Surface/createsurface.c
similarity index 100%
rename from reactos/dll/directx/ddraw/createsurface.c
rename to reactos/dll/directx/ddraw/Surface/createsurface.c
diff --git a/reactos/dll/directx/ddraw/main/surface_main.c b/reactos/dll/directx/ddraw/Surface/surface_main.c
similarity index 100%
rename from reactos/dll/directx/ddraw/main/surface_main.c
rename to reactos/dll/directx/ddraw/Surface/surface_main.c
diff --git a/reactos/dll/directx/ddraw/iface_videoport.c b/reactos/dll/directx/ddraw/Videoport/iface_videoport.c
similarity index 100%
rename from reactos/dll/directx/ddraw/iface_videoport.c
rename to reactos/dll/directx/ddraw/Videoport/iface_videoport.c
diff --git a/reactos/dll/directx/ddraw/ddraw.rbuild b/reactos/dll/directx/ddraw/ddraw.rbuild
index ca594945325..10f109d6ef0 100644
--- a/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@@ -1,3 +1,4 @@
+<!--
 <module name="ddraw" type="win32dll" entrypoint="0" installbase="system32" installname="ddraw.dll" allowwarnings ="true">
   <importlibrary definition="ddraw.def" />
 	<include base="ddraw">.</include>	
@@ -30,13 +31,12 @@
 	<file>iface_videoport.c</file>
 	<file>iface_kernel.c</file>
 
-      <file>callbacks_hel.c</file>
-      <file>callbacks_surf_hel.c</file>
+    <file>callbacks_hel.c</file>
+    <file>callbacks_surf_hel.c</file>
 
 	<directory name="main">
 		<file>ddraw_main.c</file>
 		<file>surface_main.c</file>				
 	</directory>	
-
-	
 </module>
+-->
\ No newline at end of file