diff --git a/.hgignore b/.hgignore
index bd6fbfcd..b3fadf1e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -61,4 +61,4 @@ trustdb.gpg
 __pycache__
 *.pyc
 test/python_tests/test?
-
+GNUMakefile
diff --git a/test/DecorateTests.h b/test/include/DecorateTests.h
similarity index 100%
rename from test/DecorateTests.h
rename to test/include/DecorateTests.h
diff --git a/test/EngineTestIndividualSuite.h b/test/include/EngineTestIndividualSuite.h
similarity index 100%
rename from test/EngineTestIndividualSuite.h
rename to test/include/EngineTestIndividualSuite.h
diff --git a/test/EngineTestSessionSuite.h b/test/include/EngineTestSessionSuite.h
similarity index 100%
rename from test/EngineTestSessionSuite.h
rename to test/include/EngineTestSessionSuite.h
diff --git a/test/EngineTestSuite.h b/test/include/EngineTestSuite.h
similarity index 100%
rename from test/EngineTestSuite.h
rename to test/include/EngineTestSuite.h
diff --git a/test/SuiteMaker.h b/test/include/SuiteMaker.h
similarity index 100%
rename from test/SuiteMaker.h
rename to test/include/SuiteMaker.h
diff --git a/test/TestDriver.h b/test/include/TestDriver.h
similarity index 100%
rename from test/TestDriver.h
rename to test/include/TestDriver.h
diff --git a/test/test_util.h b/test/include/test_util.h
similarity index 100%
rename from test/test_util.h
rename to test/include/test_util.h
diff --git a/test/EngineTestIndividualSuite.cc b/test/src/EngineTestIndividualSuite.cc
similarity index 100%
rename from test/EngineTestIndividualSuite.cc
rename to test/src/EngineTestIndividualSuite.cc
diff --git a/test/EngineTestSessionSuite.cc b/test/src/EngineTestSessionSuite.cc
similarity index 100%
rename from test/EngineTestSessionSuite.cc
rename to test/src/EngineTestSessionSuite.cc
diff --git a/test/EngineTestSuite.cc b/test/src/EngineTestSuite.cc
similarity index 100%
rename from test/EngineTestSuite.cc
rename to test/src/EngineTestSuite.cc
diff --git a/test/SuiteMaker.cc b/test/src/SuiteMaker.cc
similarity index 100%
rename from test/SuiteMaker.cc
rename to test/src/SuiteMaker.cc
diff --git a/test/TestDriver.cc b/test/src/TestDriver.cc
similarity index 100%
rename from test/TestDriver.cc
rename to test/src/TestDriver.cc
diff --git a/test/DecorateTests.cc b/test/src/engine_tests/DecorateTests.cc
similarity index 100%
rename from test/DecorateTests.cc
rename to test/src/engine_tests/DecorateTests.cc
diff --git a/test/test_util.cc b/test/src/util/test_util.cc
similarity index 100%
rename from test/test_util.cc
rename to test/src/util/test_util.cc