diff --git a/Makefile b/Makefile
index 3ae3a00..5c46840 100644
--- a/Makefile
+++ b/Makefile
@@ -3,12 +3,11 @@ CFLAGS += -Wall -Wextra
 CFLAGS += -DSDL
 LIB += -lSDL2 -lSDL2_ttf
 LDFLAGS = $(LIB)
-INCLUDES = -Iinclude
+INCLUDES =
 
 SRCDIR = src
 
 SOURCES = $(wildcard src/*.cpp)
-HEADERS = $(wildcard $(INCDIR)/*.h)
 OBJECTS = $(patsubst $(SRCDIR)/%,build_sdl/%,$(SOURCES:.cpp=.o))
 DEPS = $(patsubst $(SRCDIR)/%,build_sdl/%,$(SOURCES:.cpp=.d))
 
@@ -39,7 +38,8 @@ build_sdl/%.o: $(SRCDIR)/%.cpp
 	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ -MMD $< -MF "build_sdl/$(patsubst $(SRCDIR)/%,%,$(<:.cpp=.d))"
 
 clean:
-	rm $(TARGET) build_sdl/*
+	rm $(TARGET)
+	rm build_sdl -r
 
 .PHONY: clean
 
diff --git a/Makefile-prizm b/Makefile-prizm
old mode 100755
new mode 100644
index 2741812..3f18f1c
--- a/Makefile-prizm
+++ b/Makefile-prizm
@@ -23,13 +23,13 @@ TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
 SOURCES		:=	src
 DATA		:=	data  
-INCLUDES	:= include
+INCLUDES	:=
 
 #---------------------------------------------------------------------------------
 # options for code and add-in generation
 #---------------------------------------------------------------------------------
 
-MKG3AFLAGS := -n basic:racing -i uns:../unselected.bmp -i sel:../selected.bmp
+MKG3AFLAGS := -n basic:racing -i uns:../resources/unselected.bmp -i sel:../resources/selected.bmp
 
 # Optional: add -flto to CFLAGS and LDFLAGS to enable link-time optimization
 # (LTO). Doing so will usually allow the compiler to generate much better code
diff --git a/font.ttf b/resources/font.ttf
similarity index 100%
rename from font.ttf
rename to resources/font.ttf
diff --git a/selected.bmp b/resources/selected.bmp
similarity index 100%
rename from selected.bmp
rename to resources/selected.bmp
diff --git a/unselected.bmp b/resources/unselected.bmp
similarity index 100%
rename from unselected.bmp
rename to resources/unselected.bmp
diff --git a/include/car.h b/src/car.h
similarity index 100%
rename from include/car.h
rename to src/car.h
diff --git a/src/display-sdl.cpp b/src/display-sdl.cpp
index 7f0525a..b71096f 100644
--- a/src/display-sdl.cpp
+++ b/src/display-sdl.cpp
@@ -33,7 +33,7 @@ namespace Display {
 		show();
 
 		TTF_Init();
-		font = TTF_OpenFont("font.ttf", 10);
+		font = TTF_OpenFont("resources/font.ttf", 10);
 		TTF_SizeText(font, "A", NULL, &textHeight);
 	}
 
diff --git a/include/display.h b/src/display.h
similarity index 100%
rename from include/display.h
rename to src/display.h
diff --git a/include/fp.h b/src/fp.h
similarity index 100%
rename from include/fp.h
rename to src/fp.h
diff --git a/include/input.h b/src/input.h
similarity index 100%
rename from include/input.h
rename to src/input.h
diff --git a/include/mat4.h b/src/mat4.h
similarity index 100%
rename from include/mat4.h
rename to src/mat4.h
diff --git a/include/rasterizer.h b/src/rasterizer.h
similarity index 100%
rename from include/rasterizer.h
rename to src/rasterizer.h
diff --git a/include/rmath.h b/src/rmath.h
similarity index 100%
rename from include/rmath.h
rename to src/rmath.h
diff --git a/include/time.h b/src/time.h
similarity index 100%
rename from include/time.h
rename to src/time.h
diff --git a/include/track.h b/src/track.h
similarity index 100%
rename from include/track.h
rename to src/track.h
diff --git a/include/util.h b/src/util.h
similarity index 100%
rename from include/util.h
rename to src/util.h
diff --git a/include/vector.h b/src/vector.h
similarity index 100%
rename from include/vector.h
rename to src/vector.h