diff --git a/.gitignore b/.gitignore
index 7b6ab7b..7319e8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
-bin/*
-codedefs/*
-ir/*
+bin
 doc
-fonts
-sounds
-sprites
-textures
 src_crap
+data/codedefs
+data/fonts
+data/sounds
+data/sprites
+data/textures
diff --git a/Makefile b/Makefile
index a425e17..ba04b33 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,9 @@ GDCC_MAKELIB=gdcc-makelib
 
 SRC=src
 INC=inc
-CODEDEFS=codedefs
+CODEDEFS=data/codedefs
 BIN=bin
-IR=ir
+IR=bin/ir
 
 GDCC_TARGET=--bc-target=Doominati
 GDCC_LFLAGS += $(GDCC_TARGET)
diff --git a/objdefs.dod b/data/objdefs.dod
similarity index 100%
rename from objdefs.dod
rename to data/objdefs.dod
diff --git a/objdefs/player.dod b/data/objdefs/player.dod
similarity index 100%
rename from objdefs/player.dod
rename to data/objdefs/player.dod
diff --git a/resdecl.rd b/data/resdecl.rd
similarity index 100%
rename from resdecl.rd
rename to data/resdecl.rd
diff --git a/shaders/base.vp b/data/shaders/base.vp
similarity index 100%
rename from shaders/base.vp
rename to data/shaders/base.vp
diff --git a/shaders/plasma.fp b/data/shaders/plasma.fp
similarity index 100%
rename from shaders/plasma.fp
rename to data/shaders/plasma.fp