diff --git a/common.rsp b/common.rsp
index daf80c5..a119f16 100644
--- a/common.rsp
+++ b/common.rsp
@@ -3,44 +3,44 @@
 /pkg:gtk-sharp-2.0
 /pkg:glade-sharp-2.0
 
-Annotation.cs
+level/Annotation.cs
 Assembly.cs
 BinaryReaderBE.cs
 BinaryWriterBE.cs
 CrcStream.cs
 Drawer.cs
 Editor.cs
-GdkDrawer.cs
+gtk-sharp/GdkDrawer.cs
 Geometry.cs
 mac/IgeMacMenu.cs
 mac/IgeMacMenuGroup.cs
-Inspector.cs
-Level.cs
-LevelParametersDialog.cs
-Light.cs
-LightParametersDialog.cs
-Line.cs
-MapDrawingArea.cs
-MapInfo.cs
-MapObject.cs
-MapWindow.cs
-Media.cs
-MediaParametersDialog.cs
-ParametersDialogs.cs
-Platform.cs
-PlatformParametersDialog.cs
-Point.cs
-Polygon.cs
-PopupParametersDialogs.cs
-PreferencesDialog.cs
+gtk-sharp/Inspector.cs
+level/Level.cs
+gtk-sharp/LevelParametersDialog.cs
+level/Light.cs
+gtk-sharp/LightParametersDialog.cs
+level/Line.cs
+gtk-sharp/MapDrawingArea.cs
+level/MapInfo.cs
+level/MapObject.cs
+gtk-sharp/MapWindow.cs
+level/Media.cs
+gtk-sharp/MediaParametersDialog.cs
+gtk-sharp/ParametersDialogs.cs
+level/Platform.cs
+gtk-sharp/PlatformParametersDialog.cs
+level/Point.cs
+level/Polygon.cs
+gtk-sharp/PopupParametersDialogs.cs
+gtk-sharp/PreferencesDialog.cs
 Shapes.cs
 Settings.cs
-Side.cs
-Sounds.cs
-SoundParametersDialogs.cs
+level/Side.cs
+level/Sounds.cs
+gtk-sharp/SoundParametersDialogs.cs
 Wadfile.cs
 Weland.cs
-Widgets.cs
+gtk-sharp/Widgets.cs
 
 /resource:images/1x.png
 /resource:images/2x.png
diff --git a/CairoDrawer.cs b/gtk-sharp/CairoDrawer.cs
similarity index 100%
rename from CairoDrawer.cs
rename to gtk-sharp/CairoDrawer.cs
diff --git a/GdkDrawer.cs b/gtk-sharp/GdkDrawer.cs
similarity index 100%
rename from GdkDrawer.cs
rename to gtk-sharp/GdkDrawer.cs
diff --git a/Inspector.cs b/gtk-sharp/Inspector.cs
similarity index 100%
rename from Inspector.cs
rename to gtk-sharp/Inspector.cs
diff --git a/LevelParametersDialog.cs b/gtk-sharp/LevelParametersDialog.cs
similarity index 100%
rename from LevelParametersDialog.cs
rename to gtk-sharp/LevelParametersDialog.cs
diff --git a/LightParametersDialog.cs b/gtk-sharp/LightParametersDialog.cs
similarity index 100%
rename from LightParametersDialog.cs
rename to gtk-sharp/LightParametersDialog.cs
diff --git a/MapDrawingArea.cs b/gtk-sharp/MapDrawingArea.cs
similarity index 100%
rename from MapDrawingArea.cs
rename to gtk-sharp/MapDrawingArea.cs
diff --git a/MapWindow.cs b/gtk-sharp/MapWindow.cs
similarity index 100%
rename from MapWindow.cs
rename to gtk-sharp/MapWindow.cs
diff --git a/MediaParametersDialog.cs b/gtk-sharp/MediaParametersDialog.cs
similarity index 100%
rename from MediaParametersDialog.cs
rename to gtk-sharp/MediaParametersDialog.cs
diff --git a/ParametersDialogs.cs b/gtk-sharp/ParametersDialogs.cs
similarity index 100%
rename from ParametersDialogs.cs
rename to gtk-sharp/ParametersDialogs.cs
diff --git a/PlatformParametersDialog.cs b/gtk-sharp/PlatformParametersDialog.cs
similarity index 100%
rename from PlatformParametersDialog.cs
rename to gtk-sharp/PlatformParametersDialog.cs
diff --git a/PopupParametersDialogs.cs b/gtk-sharp/PopupParametersDialogs.cs
similarity index 100%
rename from PopupParametersDialogs.cs
rename to gtk-sharp/PopupParametersDialogs.cs
diff --git a/PreferencesDialog.cs b/gtk-sharp/PreferencesDialog.cs
similarity index 100%
rename from PreferencesDialog.cs
rename to gtk-sharp/PreferencesDialog.cs
diff --git a/SoundParametersDialogs.cs b/gtk-sharp/SoundParametersDialogs.cs
similarity index 100%
rename from SoundParametersDialogs.cs
rename to gtk-sharp/SoundParametersDialogs.cs
diff --git a/SystemDrawer.cs b/gtk-sharp/SystemDrawer.cs
similarity index 100%
rename from SystemDrawer.cs
rename to gtk-sharp/SystemDrawer.cs
diff --git a/Widgets.cs b/gtk-sharp/Widgets.cs
similarity index 100%
rename from Widgets.cs
rename to gtk-sharp/Widgets.cs
diff --git a/Annotation.cs b/level/Annotation.cs
similarity index 100%
rename from Annotation.cs
rename to level/Annotation.cs
diff --git a/Level.cs b/level/Level.cs
similarity index 100%
rename from Level.cs
rename to level/Level.cs
diff --git a/Light.cs b/level/Light.cs
similarity index 100%
rename from Light.cs
rename to level/Light.cs
diff --git a/Line.cs b/level/Line.cs
similarity index 100%
rename from Line.cs
rename to level/Line.cs
diff --git a/MapInfo.cs b/level/MapInfo.cs
similarity index 100%
rename from MapInfo.cs
rename to level/MapInfo.cs
diff --git a/MapObject.cs b/level/MapObject.cs
similarity index 100%
rename from MapObject.cs
rename to level/MapObject.cs
diff --git a/Media.cs b/level/Media.cs
similarity index 100%
rename from Media.cs
rename to level/Media.cs
diff --git a/Platform.cs b/level/Platform.cs
similarity index 100%
rename from Platform.cs
rename to level/Platform.cs
diff --git a/Point.cs b/level/Point.cs
similarity index 100%
rename from Point.cs
rename to level/Point.cs
diff --git a/Polygon.cs b/level/Polygon.cs
similarity index 100%
rename from Polygon.cs
rename to level/Polygon.cs
diff --git a/Side.cs b/level/Side.cs
similarity index 100%
rename from Side.cs
rename to level/Side.cs
diff --git a/Sounds.cs b/level/Sounds.cs
similarity index 100%
rename from Sounds.cs
rename to level/Sounds.cs
diff --git a/weland.rsp b/weland.rsp
index 26ed18a..a155dcd 100644
--- a/weland.rsp
+++ b/weland.rsp
@@ -2,5 +2,5 @@
 /r:Mono.Cairo
 
 @common.rsp
-CairoDrawer.cs
+gtk-sharp/CairoDrawer.cs
 
diff --git a/windows.rsp b/windows.rsp
index c4bb79a..cfe2f62 100644
--- a/windows.rsp
+++ b/windows.rsp
@@ -5,4 +5,4 @@
 /define:SYSTEM_DRAWING
 
 @common.rsp
-SystemDrawer.cs
+gtk-sharp/SystemDrawer.cs