diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/annex1reduce/AnnexOneReduceTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/annex1reduce/AnnexOneReduceTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/annex1reduce/AnnexOneReduceTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/annex1reduce/AnnexOneReduceTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/AbstractCountryTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/AbstractCountryTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/AbstractCountryTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/AbstractCountryTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/CalculateGDPRateTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/CalculateGDPRateTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/CalculateGDPRateTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/CalculateGDPRateTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/CarbonAbsorptionHandlerTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/CarbonAbsorptionHandlerTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/CarbonAbsorptionHandlerTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/CarbonAbsorptionHandlerTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedAbstractCountry.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedAbstractCountry.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedAbstractCountry.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedAbstractCountry.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedCarbonAbsorptionHandler.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedCarbonAbsorptionHandler.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedCarbonAbsorptionHandler.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedCarbonAbsorptionHandler.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedCarbonReductionHandler.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedCarbonReductionHandler.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedCarbonReductionHandler.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedCarbonReductionHandler.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedEnergyUsageHandler.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedEnergyUsageHandler.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/IsolatedEnergyUsageHandler.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/IsolatedEnergyUsageHandler.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/countries/TestCountry.java b/kyoto/src/test/java/uk/ac/ic/kyoto/countries/TestCountry.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/countries/TestCountry.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/countries/TestCountry.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/market/EconomyTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/market/EconomyTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/market/EconomyTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/market/EconomyTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/market/FossilPricesTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/market/FossilPricesTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/market/FossilPricesTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/market/FossilPricesTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/services/GlobalTimeServiceTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/services/GlobalTimeServiceTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/services/GlobalTimeServiceTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/services/GlobalTimeServiceTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/trade/TradeProtocolTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/trade/TradeProtocolTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/trade/TradeProtocolTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/trade/TradeProtocolTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/trade/TradeTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/trade/TradeTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/trade/TradeTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/trade/TradeTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/trade/TradeTest2.java b/kyoto/src/test/java/uk/ac/ic/kyoto/trade/TradeTest2.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/trade/TradeTest2.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/trade/TradeTest2.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/tradehistory/AnalysisUtilsTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/tradehistory/AnalysisUtilsTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/tradehistory/AnalysisUtilsTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/tradehistory/AnalysisUtilsTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/tradehistory/SessionHistoryTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/tradehistory/SessionHistoryTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/tradehistory/SessionHistoryTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/tradehistory/SessionHistoryTest.java
diff --git a/kyoto/src/main/test/uk/ac/ic/kyoto/tradehistory/TickHistoryTest.java b/kyoto/src/test/java/uk/ac/ic/kyoto/tradehistory/TickHistoryTest.java
similarity index 100%
rename from kyoto/src/main/test/uk/ac/ic/kyoto/tradehistory/TickHistoryTest.java
rename to kyoto/src/test/java/uk/ac/ic/kyoto/tradehistory/TickHistoryTest.java