diff --git a/CMakeLists.txt b/test/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to test/CMakeLists.txt
diff --git a/TestHelper.cpp b/test/TestHelper.cpp
similarity index 100%
rename from TestHelper.cpp
rename to test/TestHelper.cpp
diff --git a/TestHelper.h b/test/TestHelper.h
similarity index 100%
rename from TestHelper.h
rename to test/TestHelper.h
diff --git a/TestUtils.cpp b/test/TestUtils.cpp
similarity index 100%
rename from TestUtils.cpp
rename to test/TestUtils.cpp
diff --git a/TestUtils.h b/test/TestUtils.h
similarity index 100%
rename from TestUtils.h
rename to test/TestUtils.h
diff --git a/boostTest.cpp b/test/boostTest.cpp
similarity index 100%
rename from boostTest.cpp
rename to test/boostTest.cpp
diff --git a/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
similarity index 100%
rename from contracts/AuctionRegistrar.cpp
rename to test/contracts/AuctionRegistrar.cpp
diff --git a/contracts/CMakeLists.txt b/test/contracts/CMakeLists.txt
similarity index 100%
rename from contracts/CMakeLists.txt
rename to test/contracts/CMakeLists.txt
diff --git a/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp
similarity index 100%
rename from contracts/FixedFeeRegistrar.cpp
rename to test/contracts/FixedFeeRegistrar.cpp
diff --git a/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
similarity index 100%
rename from contracts/Wallet.cpp
rename to test/contracts/Wallet.cpp
diff --git a/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
similarity index 100%
rename from libsolidity/Assembly.cpp
rename to test/libsolidity/Assembly.cpp
diff --git a/libsolidity/CMakeLists.txt b/test/libsolidity/CMakeLists.txt
similarity index 100%
rename from libsolidity/CMakeLists.txt
rename to test/libsolidity/CMakeLists.txt
diff --git a/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
similarity index 100%
rename from libsolidity/GasMeter.cpp
rename to test/libsolidity/GasMeter.cpp
diff --git a/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp
similarity index 100%
rename from libsolidity/SolidityABIJSON.cpp
rename to test/libsolidity/SolidityABIJSON.cpp
diff --git a/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
similarity index 100%
rename from libsolidity/SolidityEndToEndTest.cpp
rename to test/libsolidity/SolidityEndToEndTest.cpp
diff --git a/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
similarity index 100%
rename from libsolidity/SolidityExpressionCompiler.cpp
rename to test/libsolidity/SolidityExpressionCompiler.cpp
diff --git a/libsolidity/SolidityInterface.cpp b/test/libsolidity/SolidityInterface.cpp
similarity index 100%
rename from libsolidity/SolidityInterface.cpp
rename to test/libsolidity/SolidityInterface.cpp
diff --git a/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
similarity index 100%
rename from libsolidity/SolidityNameAndTypeResolution.cpp
rename to test/libsolidity/SolidityNameAndTypeResolution.cpp
diff --git a/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
similarity index 100%
rename from libsolidity/SolidityNatspecJSON.cpp
rename to test/libsolidity/SolidityNatspecJSON.cpp
diff --git a/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
similarity index 100%
rename from libsolidity/SolidityOptimizer.cpp
rename to test/libsolidity/SolidityOptimizer.cpp
diff --git a/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
similarity index 100%
rename from libsolidity/SolidityParser.cpp
rename to test/libsolidity/SolidityParser.cpp
diff --git a/libsolidity/SolidityScanner.cpp b/test/libsolidity/SolidityScanner.cpp
similarity index 100%
rename from libsolidity/SolidityScanner.cpp
rename to test/libsolidity/SolidityScanner.cpp
diff --git a/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
similarity index 100%
rename from libsolidity/SolidityTypes.cpp
rename to test/libsolidity/SolidityTypes.cpp
diff --git a/libsolidity/solidityExecutionFramework.h b/test/libsolidity/solidityExecutionFramework.h
similarity index 100%
rename from libsolidity/solidityExecutionFramework.h
rename to test/libsolidity/solidityExecutionFramework.h