diff --git a/test/net/sf/openrocket/Estes_A8.rse b/core/test/net/sf/openrocket/Estes_A8.rse
similarity index 100%
rename from test/net/sf/openrocket/Estes_A8.rse
rename to core/test/net/sf/openrocket/Estes_A8.rse
diff --git a/test/net/sf/openrocket/IntegrationTest.java b/core/test/net/sf/openrocket/IntegrationTest.java
similarity index 100%
rename from test/net/sf/openrocket/IntegrationTest.java
rename to core/test/net/sf/openrocket/IntegrationTest.java
diff --git a/test/net/sf/openrocket/arch/TestSystemInfo.java b/core/test/net/sf/openrocket/arch/TestSystemInfo.java
similarity index 100%
rename from test/net/sf/openrocket/arch/TestSystemInfo.java
rename to core/test/net/sf/openrocket/arch/TestSystemInfo.java
diff --git a/test/net/sf/openrocket/communication/BugReportTest.java b/core/test/net/sf/openrocket/communication/BugReportTest.java
similarity index 100%
rename from test/net/sf/openrocket/communication/BugReportTest.java
rename to core/test/net/sf/openrocket/communication/BugReportTest.java
diff --git a/test/net/sf/openrocket/communication/ConnectionSourceStub.java b/core/test/net/sf/openrocket/communication/ConnectionSourceStub.java
similarity index 100%
rename from test/net/sf/openrocket/communication/ConnectionSourceStub.java
rename to core/test/net/sf/openrocket/communication/ConnectionSourceStub.java
diff --git a/test/net/sf/openrocket/communication/HttpURLConnectionMock.java b/core/test/net/sf/openrocket/communication/HttpURLConnectionMock.java
similarity index 100%
rename from test/net/sf/openrocket/communication/HttpURLConnectionMock.java
rename to core/test/net/sf/openrocket/communication/HttpURLConnectionMock.java
diff --git a/test/net/sf/openrocket/communication/UpdateInfoTest.java b/core/test/net/sf/openrocket/communication/UpdateInfoTest.java
similarity index 100%
rename from test/net/sf/openrocket/communication/UpdateInfoTest.java
rename to core/test/net/sf/openrocket/communication/UpdateInfoTest.java
diff --git a/test/net/sf/openrocket/database/MotorSetDatabaseTest.java b/core/test/net/sf/openrocket/database/MotorSetDatabaseTest.java
similarity index 100%
rename from test/net/sf/openrocket/database/MotorSetDatabaseTest.java
rename to core/test/net/sf/openrocket/database/MotorSetDatabaseTest.java
diff --git a/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java b/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java
similarity index 100%
rename from test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java
rename to core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java
diff --git a/test/net/sf/openrocket/file/iterator/TestDirectoryIterator.java b/core/test/net/sf/openrocket/file/iterator/TestDirectoryIterator.java
similarity index 100%
rename from test/net/sf/openrocket/file/iterator/TestDirectoryIterator.java
rename to core/test/net/sf/openrocket/file/iterator/TestDirectoryIterator.java
diff --git a/test/net/sf/openrocket/file/iterator/TestFileIterator.java b/core/test/net/sf/openrocket/file/iterator/TestFileIterator.java
similarity index 100%
rename from test/net/sf/openrocket/file/iterator/TestFileIterator.java
rename to core/test/net/sf/openrocket/file/iterator/TestFileIterator.java
diff --git a/test/net/sf/openrocket/file/motor/TestMotorLoader.java b/core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
similarity index 100%
rename from test/net/sf/openrocket/file/motor/TestMotorLoader.java
rename to core/test/net/sf/openrocket/file/motor/TestMotorLoader.java
diff --git a/test/net/sf/openrocket/file/motor/test.txt b/core/test/net/sf/openrocket/file/motor/test.txt
similarity index 100%
rename from test/net/sf/openrocket/file/motor/test.txt
rename to core/test/net/sf/openrocket/file/motor/test.txt
diff --git a/test/net/sf/openrocket/file/motor/test.zip b/core/test/net/sf/openrocket/file/motor/test.zip
similarity index 100%
rename from test/net/sf/openrocket/file/motor/test.zip
rename to core/test/net/sf/openrocket/file/motor/test.zip
diff --git a/test/net/sf/openrocket/file/motor/test1.eng b/core/test/net/sf/openrocket/file/motor/test1.eng
similarity index 100%
rename from test/net/sf/openrocket/file/motor/test1.eng
rename to core/test/net/sf/openrocket/file/motor/test1.eng
diff --git a/test/net/sf/openrocket/file/motor/test2.rse b/core/test/net/sf/openrocket/file/motor/test2.rse
similarity index 100%
rename from test/net/sf/openrocket/file/motor/test2.rse
rename to core/test/net/sf/openrocket/file/motor/test2.rse
diff --git a/test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java b/core/test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java
rename to core/test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/PodFins.rkt b/core/test/net/sf/openrocket/file/rocksim/importt/PodFins.rkt
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/PodFins.rkt
rename to core/test/net/sf/openrocket/file/rocksim/importt/PodFins.rkt
diff --git a/test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/RocksimContentHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimContentHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/RocksimContentHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/RocksimContentHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java
rename to core/test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java
diff --git a/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket1.rkt b/core/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket1.rkt
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket1.rkt
rename to core/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket1.rkt
diff --git a/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket2.rkt b/core/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket2.rkt
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket2.rkt
rename to core/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket2.rkt
diff --git a/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket3.rkt b/core/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket3.rkt
similarity index 100%
rename from test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket3.rkt
rename to core/test/net/sf/openrocket/file/rocksim/importt/rocksimTestRocket3.rkt
diff --git a/test/net/sf/openrocket/gui/TestGUI.java b/core/test/net/sf/openrocket/gui/TestGUI.java
similarity index 100%
rename from test/net/sf/openrocket/gui/TestGUI.java
rename to core/test/net/sf/openrocket/gui/TestGUI.java
diff --git a/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java b/core/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java
similarity index 100%
rename from test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java
rename to core/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java
diff --git a/test/net/sf/openrocket/gui/print/TestPaperSize.java b/core/test/net/sf/openrocket/gui/print/TestPaperSize.java
similarity index 100%
rename from test/net/sf/openrocket/gui/print/TestPaperSize.java
rename to core/test/net/sf/openrocket/gui/print/TestPaperSize.java
diff --git a/test/net/sf/openrocket/l10n/TestClassBasedTranslator.java b/core/test/net/sf/openrocket/l10n/TestClassBasedTranslator.java
similarity index 100%
rename from test/net/sf/openrocket/l10n/TestClassBasedTranslator.java
rename to core/test/net/sf/openrocket/l10n/TestClassBasedTranslator.java
diff --git a/test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java b/core/test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java
similarity index 100%
rename from test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java
rename to core/test/net/sf/openrocket/l10n/TestExceptionSuppressingTranslator.java
diff --git a/test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java b/core/test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java
similarity index 100%
rename from test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java
rename to core/test/net/sf/openrocket/l10n/TestResourceBundleTranslator.java
diff --git a/test/net/sf/openrocket/logging/CyclicBufferTest.java b/core/test/net/sf/openrocket/logging/CyclicBufferTest.java
similarity index 100%
rename from test/net/sf/openrocket/logging/CyclicBufferTest.java
rename to core/test/net/sf/openrocket/logging/CyclicBufferTest.java
diff --git a/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java b/core/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java
similarity index 100%
rename from test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java
rename to core/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java
diff --git a/test/net/sf/openrocket/logging/LogLevelTest.java b/core/test/net/sf/openrocket/logging/LogLevelTest.java
similarity index 100%
rename from test/net/sf/openrocket/logging/LogLevelTest.java
rename to core/test/net/sf/openrocket/logging/LogLevelTest.java
diff --git a/test/net/sf/openrocket/logging/LoggingTest.java b/core/test/net/sf/openrocket/logging/LoggingTest.java
similarity index 100%
rename from test/net/sf/openrocket/logging/LoggingTest.java
rename to core/test/net/sf/openrocket/logging/LoggingTest.java
diff --git a/test/net/sf/openrocket/logging/TraceExceptionTest.java b/core/test/net/sf/openrocket/logging/TraceExceptionTest.java
similarity index 100%
rename from test/net/sf/openrocket/logging/TraceExceptionTest.java
rename to core/test/net/sf/openrocket/logging/TraceExceptionTest.java
diff --git a/test/net/sf/openrocket/models/gravity/WGSGravityModelTest.java b/core/test/net/sf/openrocket/models/gravity/WGSGravityModelTest.java
similarity index 100%
rename from test/net/sf/openrocket/models/gravity/WGSGravityModelTest.java
rename to core/test/net/sf/openrocket/models/gravity/WGSGravityModelTest.java
diff --git a/test/net/sf/openrocket/motor/ManufacturerTest.java b/core/test/net/sf/openrocket/motor/ManufacturerTest.java
similarity index 100%
rename from test/net/sf/openrocket/motor/ManufacturerTest.java
rename to core/test/net/sf/openrocket/motor/ManufacturerTest.java
diff --git a/test/net/sf/openrocket/motor/MotorDigestTest.java b/core/test/net/sf/openrocket/motor/MotorDigestTest.java
similarity index 100%
rename from test/net/sf/openrocket/motor/MotorDigestTest.java
rename to core/test/net/sf/openrocket/motor/MotorDigestTest.java
diff --git a/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java b/core/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java
similarity index 100%
rename from test/net/sf/openrocket/motor/ThrustCurveMotorTest.java
rename to core/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java
diff --git a/test/net/sf/openrocket/optimization/TestSearchPattern.java b/core/test/net/sf/openrocket/optimization/TestSearchPattern.java
similarity index 100%
rename from test/net/sf/openrocket/optimization/TestSearchPattern.java
rename to core/test/net/sf/openrocket/optimization/TestSearchPattern.java
diff --git a/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java b/core/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java
similarity index 100%
rename from test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java
rename to core/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java
diff --git a/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java b/core/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java
similarity index 100%
rename from test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java
rename to core/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java
diff --git a/test/net/sf/openrocket/rocketcomponent/ComponentCompare.java b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompare.java
similarity index 100%
rename from test/net/sf/openrocket/rocketcomponent/ComponentCompare.java
rename to core/test/net/sf/openrocket/rocketcomponent/ComponentCompare.java
diff --git a/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java
similarity index 100%
rename from test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java
rename to core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java
diff --git a/test/net/sf/openrocket/rocketcomponent/FinSetTest.java b/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
similarity index 100%
rename from test/net/sf/openrocket/rocketcomponent/FinSetTest.java
rename to core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
diff --git a/test/net/sf/openrocket/rocketcomponent/RocketTest.java b/core/test/net/sf/openrocket/rocketcomponent/RocketTest.java
similarity index 100%
rename from test/net/sf/openrocket/rocketcomponent/RocketTest.java
rename to core/test/net/sf/openrocket/rocketcomponent/RocketTest.java
diff --git a/test/net/sf/openrocket/simplerocket.ork b/core/test/net/sf/openrocket/simplerocket.ork
similarity index 100%
rename from test/net/sf/openrocket/simplerocket.ork
rename to core/test/net/sf/openrocket/simplerocket.ork
diff --git a/test/net/sf/openrocket/unit/ValueTest.java b/core/test/net/sf/openrocket/unit/ValueTest.java
similarity index 100%
rename from test/net/sf/openrocket/unit/ValueTest.java
rename to core/test/net/sf/openrocket/unit/ValueTest.java
diff --git a/test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java b/core/test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java
similarity index 100%
rename from test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java
rename to core/test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java
diff --git a/test/net/sf/openrocket/util/CoordinateTest.java b/core/test/net/sf/openrocket/util/CoordinateTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/CoordinateTest.java
rename to core/test/net/sf/openrocket/util/CoordinateTest.java
diff --git a/test/net/sf/openrocket/util/GeodeticComputationStrategyTest.java b/core/test/net/sf/openrocket/util/GeodeticComputationStrategyTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/GeodeticComputationStrategyTest.java
rename to core/test/net/sf/openrocket/util/GeodeticComputationStrategyTest.java
diff --git a/test/net/sf/openrocket/util/MathUtilTest.java b/core/test/net/sf/openrocket/util/MathUtilTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/MathUtilTest.java
rename to core/test/net/sf/openrocket/util/MathUtilTest.java
diff --git a/test/net/sf/openrocket/util/MutableTest.java b/core/test/net/sf/openrocket/util/MutableTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/MutableTest.java
rename to core/test/net/sf/openrocket/util/MutableTest.java
diff --git a/test/net/sf/openrocket/util/ReflectionTest.java b/core/test/net/sf/openrocket/util/ReflectionTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/ReflectionTest.java
rename to core/test/net/sf/openrocket/util/ReflectionTest.java
diff --git a/test/net/sf/openrocket/util/Rotation2DTest.java b/core/test/net/sf/openrocket/util/Rotation2DTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/Rotation2DTest.java
rename to core/test/net/sf/openrocket/util/Rotation2DTest.java
diff --git a/test/net/sf/openrocket/util/TestMutex.java b/core/test/net/sf/openrocket/util/TestMutex.java
similarity index 100%
rename from test/net/sf/openrocket/util/TestMutex.java
rename to core/test/net/sf/openrocket/util/TestMutex.java
diff --git a/test/net/sf/openrocket/util/TextUtilTest.java b/core/test/net/sf/openrocket/util/TextUtilTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/TextUtilTest.java
rename to core/test/net/sf/openrocket/util/TextUtilTest.java
diff --git a/test/net/sf/openrocket/util/UniqueIDTest.java b/core/test/net/sf/openrocket/util/UniqueIDTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/UniqueIDTest.java
rename to core/test/net/sf/openrocket/util/UniqueIDTest.java
diff --git a/test/net/sf/openrocket/util/WorldCoordinateTest.java b/core/test/net/sf/openrocket/util/WorldCoordinateTest.java
similarity index 100%
rename from test/net/sf/openrocket/util/WorldCoordinateTest.java
rename to core/test/net/sf/openrocket/util/WorldCoordinateTest.java