diff --git a/Makefile b/Makefile
index 86cd1f9..ad4d791 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ ExtraFlags := \
 	-pedantic -Wall -Wextra \
 	-Wno-unused-parameter -Wno-missing-field-initializers
 CommonFlags := $(CFLAGS) $(OPTFLAGS) $(ExtraFlags)
-CompileOnlyFlags := -std=c99
+CompileOnlyFlags := -std=c99 -I$(SRCROOT)/src
 CompileFlags := $(CompileOnlyFlags) $(CommonFlags)
 LinkFlags := $(CommonFlags)
 LinkFlags.glutTest := $(LinkFlags) \
@@ -48,7 +48,9 @@ $(OBJROOT)/glutTest: $(Objects.glutTest)
 $(OBJROOT)/perfTest: $(Objects.perfTest)
 	$(LD) -o $@ $(Objects.perfTest) $(LinkFlags.perfTest)
 
-$(OBJROOT)/%.o: $(SRCROOT)/%.c $(Headers) Makefile $(OBJROOT)/.dir
+$(OBJROOT)/%.o: $(SRCROOT)/tests/%.c $(Headers) Makefile $(OBJROOT)/.dir
+	$(CC) -c -o $@ $< $(CompileFlags)
+$(OBJROOT)/%.o: $(SRCROOT)/src/%.c $(Headers) Makefile $(OBJROOT)/.dir
 	$(CC) -c -o $@ $< $(CompileFlags)
 
 %/.dir:
diff --git a/CCGSubSurf.c b/src/CCGSubSurf.c
similarity index 100%
rename from CCGSubSurf.c
rename to src/CCGSubSurf.c
diff --git a/CCGSubSurf.h b/src/CCGSubSurf.h
similarity index 100%
rename from CCGSubSurf.h
rename to src/CCGSubSurf.h
diff --git a/QMesh.c b/tests/QMesh.c
similarity index 100%
rename from QMesh.c
rename to tests/QMesh.c
diff --git a/QMesh.h b/tests/QMesh.h
similarity index 100%
rename from QMesh.h
rename to tests/QMesh.h
diff --git a/glutTest.c b/tests/glutTest.c
similarity index 100%
rename from glutTest.c
rename to tests/glutTest.c
diff --git a/perfTest.c b/tests/perfTest.c
similarity index 100%
rename from perfTest.c
rename to tests/perfTest.c