diff --git a/Paths_htanks.hs b/Paths_htanks.hs
deleted file mode 100644
index 7dd7e2a..0000000
--- a/Paths_htanks.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Paths_htanks where
-
-getDataFileName :: FilePath -> IO FilePath
-getDataFileName = return
diff --git a/htanks.cabal b/htanks.cabal
index 847d937..0a705e9 100644
--- a/htanks.cabal
+++ b/htanks.cabal
@@ -9,10 +9,11 @@ author:              Matthias Schiffer
 maintainer:          matthias@gamezock.de
 build-depends:       base >= 4, syb, containers, mtl, time, X11, OpenGL
 build-type:          Simple
-data-files:          tex/Bullet.png, tex/Cannon.png, tex/Tank.png, tex/Wood.png
+data-files:          tex/*.png
 
 executable:          HTanks
+hs-source-dirs:      src
 main-is:             HTanks.hs
-other-modules:       Bindings.GLX, Bindings.GLPng
+other-modules:       CPUPlayer, DefaultPlayer, Game, GLDriver, GLX, Level, Paths_htanks, Player, Render, Texture, Bindings.GLX, Bindings.GLPng
 ghc-options:         -threaded
 extra-libraries:     glpng
diff --git a/Bindings/GLPng.hsc b/src/Bindings/GLPng.hsc
similarity index 100%
rename from Bindings/GLPng.hsc
rename to src/Bindings/GLPng.hsc
diff --git a/Bindings/GLX.hsc b/src/Bindings/GLX.hsc
similarity index 100%
rename from Bindings/GLX.hsc
rename to src/Bindings/GLX.hsc
diff --git a/CPUPlayer.hs b/src/CPUPlayer.hs
similarity index 100%
rename from CPUPlayer.hs
rename to src/CPUPlayer.hs
diff --git a/DefaultPlayer.hs b/src/DefaultPlayer.hs
similarity index 100%
rename from DefaultPlayer.hs
rename to src/DefaultPlayer.hs
diff --git a/GLDriver.hs b/src/GLDriver.hs
similarity index 100%
rename from GLDriver.hs
rename to src/GLDriver.hs
diff --git a/GLX.hs b/src/GLX.hs
similarity index 100%
rename from GLX.hs
rename to src/GLX.hs
diff --git a/Game.hs b/src/Game.hs
similarity index 100%
rename from Game.hs
rename to src/Game.hs
diff --git a/HTanks.hs b/src/HTanks.hs
similarity index 100%
rename from HTanks.hs
rename to src/HTanks.hs
diff --git a/Level.hs b/src/Level.hs
similarity index 100%
rename from Level.hs
rename to src/Level.hs
diff --git a/Player.hs b/src/Player.hs
similarity index 100%
rename from Player.hs
rename to src/Player.hs
diff --git a/Render.hs b/src/Render.hs
similarity index 100%
rename from Render.hs
rename to src/Render.hs
diff --git a/Texture.hs b/src/Texture.hs
similarity index 100%
rename from Texture.hs
rename to src/Texture.hs