diff --git a/src/META-INF/services/net.sf.openrocket.optimization.services.OptimizableParameterService b/core/src/META-INF/services/net.sf.openrocket.optimization.services.OptimizableParameterService similarity index 100% rename from src/META-INF/services/net.sf.openrocket.optimization.services.OptimizableParameterService rename to core/src/META-INF/services/net.sf.openrocket.optimization.services.OptimizableParameterService diff --git a/src/META-INF/services/net.sf.openrocket.optimization.services.SimulationModifierService b/core/src/META-INF/services/net.sf.openrocket.optimization.services.SimulationModifierService similarity index 100% rename from src/META-INF/services/net.sf.openrocket.optimization.services.SimulationModifierService rename to core/src/META-INF/services/net.sf.openrocket.optimization.services.SimulationModifierService diff --git a/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java b/core/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java rename to core/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java diff --git a/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java b/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java rename to core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java diff --git a/src/net/sf/openrocket/aerodynamics/AerodynamicForces.java b/core/src/net/sf/openrocket/aerodynamics/AerodynamicForces.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/AerodynamicForces.java rename to core/src/net/sf/openrocket/aerodynamics/AerodynamicForces.java diff --git a/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java rename to core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java diff --git a/src/net/sf/openrocket/aerodynamics/FlightConditions.java b/core/src/net/sf/openrocket/aerodynamics/FlightConditions.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/FlightConditions.java rename to core/src/net/sf/openrocket/aerodynamics/FlightConditions.java diff --git a/src/net/sf/openrocket/aerodynamics/Warning.java b/core/src/net/sf/openrocket/aerodynamics/Warning.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/Warning.java rename to core/src/net/sf/openrocket/aerodynamics/Warning.java diff --git a/src/net/sf/openrocket/aerodynamics/WarningSet.java b/core/src/net/sf/openrocket/aerodynamics/WarningSet.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/WarningSet.java rename to core/src/net/sf/openrocket/aerodynamics/WarningSet.java diff --git a/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java rename to core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java diff --git a/src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java rename to core/src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java diff --git a/src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java rename to core/src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java diff --git a/src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java similarity index 100% rename from src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java rename to core/src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java diff --git a/src/net/sf/openrocket/arch/SystemInfo.java b/core/src/net/sf/openrocket/arch/SystemInfo.java similarity index 100% rename from src/net/sf/openrocket/arch/SystemInfo.java rename to core/src/net/sf/openrocket/arch/SystemInfo.java diff --git a/src/net/sf/openrocket/communication/BugReporter.java b/core/src/net/sf/openrocket/communication/BugReporter.java similarity index 100% rename from src/net/sf/openrocket/communication/BugReporter.java rename to core/src/net/sf/openrocket/communication/BugReporter.java diff --git a/src/net/sf/openrocket/communication/Communicator.java b/core/src/net/sf/openrocket/communication/Communicator.java similarity index 100% rename from src/net/sf/openrocket/communication/Communicator.java rename to core/src/net/sf/openrocket/communication/Communicator.java diff --git a/src/net/sf/openrocket/communication/ConnectionSource.java b/core/src/net/sf/openrocket/communication/ConnectionSource.java similarity index 100% rename from src/net/sf/openrocket/communication/ConnectionSource.java rename to core/src/net/sf/openrocket/communication/ConnectionSource.java diff --git a/src/net/sf/openrocket/communication/DefaultConnectionSource.java b/core/src/net/sf/openrocket/communication/DefaultConnectionSource.java similarity index 100% rename from src/net/sf/openrocket/communication/DefaultConnectionSource.java rename to core/src/net/sf/openrocket/communication/DefaultConnectionSource.java diff --git a/src/net/sf/openrocket/communication/UpdateInfo.java b/core/src/net/sf/openrocket/communication/UpdateInfo.java similarity index 100% rename from src/net/sf/openrocket/communication/UpdateInfo.java rename to core/src/net/sf/openrocket/communication/UpdateInfo.java diff --git a/src/net/sf/openrocket/communication/UpdateInfoRetriever.java b/core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java similarity index 100% rename from src/net/sf/openrocket/communication/UpdateInfoRetriever.java rename to core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java diff --git a/src/net/sf/openrocket/database/Database.java b/core/src/net/sf/openrocket/database/Database.java similarity index 100% rename from src/net/sf/openrocket/database/Database.java rename to core/src/net/sf/openrocket/database/Database.java diff --git a/src/net/sf/openrocket/database/DatabaseListener.java b/core/src/net/sf/openrocket/database/DatabaseListener.java similarity index 100% rename from src/net/sf/openrocket/database/DatabaseListener.java rename to core/src/net/sf/openrocket/database/DatabaseListener.java diff --git a/src/net/sf/openrocket/database/Databases.java b/core/src/net/sf/openrocket/database/Databases.java similarity index 100% rename from src/net/sf/openrocket/database/Databases.java rename to core/src/net/sf/openrocket/database/Databases.java diff --git a/src/net/sf/openrocket/database/MotorDatabase.java b/core/src/net/sf/openrocket/database/MotorDatabase.java similarity index 100% rename from src/net/sf/openrocket/database/MotorDatabase.java rename to core/src/net/sf/openrocket/database/MotorDatabase.java diff --git a/src/net/sf/openrocket/database/ThrustCurveMotorSet.java b/core/src/net/sf/openrocket/database/ThrustCurveMotorSet.java similarity index 100% rename from src/net/sf/openrocket/database/ThrustCurveMotorSet.java rename to core/src/net/sf/openrocket/database/ThrustCurveMotorSet.java diff --git a/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java b/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java similarity index 100% rename from src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java rename to core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java diff --git a/src/net/sf/openrocket/document/OpenRocketDocument.java b/core/src/net/sf/openrocket/document/OpenRocketDocument.java similarity index 100% rename from src/net/sf/openrocket/document/OpenRocketDocument.java rename to core/src/net/sf/openrocket/document/OpenRocketDocument.java diff --git a/src/net/sf/openrocket/document/Simulation.java b/core/src/net/sf/openrocket/document/Simulation.java similarity index 100% rename from src/net/sf/openrocket/document/Simulation.java rename to core/src/net/sf/openrocket/document/Simulation.java diff --git a/src/net/sf/openrocket/document/StorageOptions.java b/core/src/net/sf/openrocket/document/StorageOptions.java similarity index 100% rename from src/net/sf/openrocket/document/StorageOptions.java rename to core/src/net/sf/openrocket/document/StorageOptions.java diff --git a/src/net/sf/openrocket/document/UndoRedoListener.java b/core/src/net/sf/openrocket/document/UndoRedoListener.java similarity index 100% rename from src/net/sf/openrocket/document/UndoRedoListener.java rename to core/src/net/sf/openrocket/document/UndoRedoListener.java diff --git a/src/net/sf/openrocket/document/events/DocumentChangeEvent.java b/core/src/net/sf/openrocket/document/events/DocumentChangeEvent.java similarity index 100% rename from src/net/sf/openrocket/document/events/DocumentChangeEvent.java rename to core/src/net/sf/openrocket/document/events/DocumentChangeEvent.java diff --git a/src/net/sf/openrocket/document/events/DocumentChangeListener.java b/core/src/net/sf/openrocket/document/events/DocumentChangeListener.java similarity index 100% rename from src/net/sf/openrocket/document/events/DocumentChangeListener.java rename to core/src/net/sf/openrocket/document/events/DocumentChangeListener.java diff --git a/src/net/sf/openrocket/document/events/SimulationChangeEvent.java b/core/src/net/sf/openrocket/document/events/SimulationChangeEvent.java similarity index 100% rename from src/net/sf/openrocket/document/events/SimulationChangeEvent.java rename to core/src/net/sf/openrocket/document/events/SimulationChangeEvent.java diff --git a/src/net/sf/openrocket/file/CSVExport.java b/core/src/net/sf/openrocket/file/CSVExport.java similarity index 100% rename from src/net/sf/openrocket/file/CSVExport.java rename to core/src/net/sf/openrocket/file/CSVExport.java diff --git a/src/net/sf/openrocket/file/GeneralRocketLoader.java b/core/src/net/sf/openrocket/file/GeneralRocketLoader.java similarity index 100% rename from src/net/sf/openrocket/file/GeneralRocketLoader.java rename to core/src/net/sf/openrocket/file/GeneralRocketLoader.java diff --git a/src/net/sf/openrocket/file/Loader.java b/core/src/net/sf/openrocket/file/Loader.java similarity index 100% rename from src/net/sf/openrocket/file/Loader.java rename to core/src/net/sf/openrocket/file/Loader.java diff --git a/src/net/sf/openrocket/file/RocketLoadException.java b/core/src/net/sf/openrocket/file/RocketLoadException.java similarity index 100% rename from src/net/sf/openrocket/file/RocketLoadException.java rename to core/src/net/sf/openrocket/file/RocketLoadException.java diff --git a/src/net/sf/openrocket/file/RocketLoader.java b/core/src/net/sf/openrocket/file/RocketLoader.java similarity index 100% rename from src/net/sf/openrocket/file/RocketLoader.java rename to core/src/net/sf/openrocket/file/RocketLoader.java diff --git a/src/net/sf/openrocket/file/RocketSaver.java b/core/src/net/sf/openrocket/file/RocketSaver.java similarity index 100% rename from src/net/sf/openrocket/file/RocketSaver.java rename to core/src/net/sf/openrocket/file/RocketSaver.java diff --git a/src/net/sf/openrocket/file/UnknownFileTypeException.java b/core/src/net/sf/openrocket/file/UnknownFileTypeException.java similarity index 100% rename from src/net/sf/openrocket/file/UnknownFileTypeException.java rename to core/src/net/sf/openrocket/file/UnknownFileTypeException.java diff --git a/src/net/sf/openrocket/file/configuration/XmlContainerElement.java b/core/src/net/sf/openrocket/file/configuration/XmlContainerElement.java similarity index 100% rename from src/net/sf/openrocket/file/configuration/XmlContainerElement.java rename to core/src/net/sf/openrocket/file/configuration/XmlContainerElement.java diff --git a/src/net/sf/openrocket/file/configuration/XmlContentElement.java b/core/src/net/sf/openrocket/file/configuration/XmlContentElement.java similarity index 100% rename from src/net/sf/openrocket/file/configuration/XmlContentElement.java rename to core/src/net/sf/openrocket/file/configuration/XmlContentElement.java diff --git a/src/net/sf/openrocket/file/configuration/XmlElement.java b/core/src/net/sf/openrocket/file/configuration/XmlElement.java similarity index 100% rename from src/net/sf/openrocket/file/configuration/XmlElement.java rename to core/src/net/sf/openrocket/file/configuration/XmlElement.java diff --git a/src/net/sf/openrocket/file/iterator/DirectoryIterator.java b/core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java similarity index 100% rename from src/net/sf/openrocket/file/iterator/DirectoryIterator.java rename to core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java diff --git a/src/net/sf/openrocket/file/iterator/FileIterator.java b/core/src/net/sf/openrocket/file/iterator/FileIterator.java similarity index 100% rename from src/net/sf/openrocket/file/iterator/FileIterator.java rename to core/src/net/sf/openrocket/file/iterator/FileIterator.java diff --git a/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java b/core/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java similarity index 100% rename from src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java rename to core/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java diff --git a/src/net/sf/openrocket/file/motor/AbstractMotorLoader.java b/core/src/net/sf/openrocket/file/motor/AbstractMotorLoader.java similarity index 100% rename from src/net/sf/openrocket/file/motor/AbstractMotorLoader.java rename to core/src/net/sf/openrocket/file/motor/AbstractMotorLoader.java diff --git a/src/net/sf/openrocket/file/motor/GeneralMotorLoader.java b/core/src/net/sf/openrocket/file/motor/GeneralMotorLoader.java similarity index 100% rename from src/net/sf/openrocket/file/motor/GeneralMotorLoader.java rename to core/src/net/sf/openrocket/file/motor/GeneralMotorLoader.java diff --git a/src/net/sf/openrocket/file/motor/MotorLoader.java b/core/src/net/sf/openrocket/file/motor/MotorLoader.java similarity index 100% rename from src/net/sf/openrocket/file/motor/MotorLoader.java rename to core/src/net/sf/openrocket/file/motor/MotorLoader.java diff --git a/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java b/core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java similarity index 100% rename from src/net/sf/openrocket/file/motor/MotorLoaderHelper.java rename to core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java diff --git a/src/net/sf/openrocket/file/motor/RASPMotorLoader.java b/core/src/net/sf/openrocket/file/motor/RASPMotorLoader.java similarity index 100% rename from src/net/sf/openrocket/file/motor/RASPMotorLoader.java rename to core/src/net/sf/openrocket/file/motor/RASPMotorLoader.java diff --git a/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java b/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java similarity index 100% rename from src/net/sf/openrocket/file/motor/RockSimMotorLoader.java rename to core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java diff --git a/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java b/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java similarity index 100% rename from src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java rename to core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java diff --git a/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java rename to core/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java diff --git a/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java rename to core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/PreferredMotorDigests.java b/core/src/net/sf/openrocket/file/openrocket/PreferredMotorDigests.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/PreferredMotorDigests.java rename to core/src/net/sf/openrocket/file/openrocket/PreferredMotorDigests.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/BodyComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/BodyComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/BodyComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/BodyComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/BodyTubeSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/BodyTubeSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/BodyTubeSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/BodyTubeSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/BulkheadSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/BulkheadSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/BulkheadSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/BulkheadSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/CenteringRingSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/CenteringRingSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/CenteringRingSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/CenteringRingSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/EllipticalFinSetSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/EllipticalFinSetSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/EllipticalFinSetSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/EllipticalFinSetSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/EngineBlockSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/EngineBlockSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/EngineBlockSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/EngineBlockSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/ExternalComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/ExternalComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/ExternalComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/ExternalComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/FinSetSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/FinSetSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/FinSetSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/FinSetSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/FreeformFinSetSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/FreeformFinSetSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/FreeformFinSetSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/FreeformFinSetSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/InnerTubeSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/InnerTubeSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/InnerTubeSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/InnerTubeSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/InternalComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/InternalComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/InternalComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/InternalComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/LaunchLugSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/LaunchLugSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/LaunchLugSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/LaunchLugSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/NoseConeSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/NoseConeSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/NoseConeSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/NoseConeSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/ParachuteSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/ParachuteSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/ParachuteSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/ParachuteSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/RadiusRingComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RadiusRingComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/RadiusRingComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/RadiusRingComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/RingComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RingComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/RingComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/RingComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/ShockCordSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/ShockCordSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/ShockCordSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/ShockCordSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/StageSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/StageSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/StageSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/StageSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/StreamerSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/StreamerSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/StreamerSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/StreamerSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/StructuralComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/StructuralComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/StructuralComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/StructuralComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/SymmetricComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/SymmetricComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/SymmetricComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/SymmetricComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/ThicknessRingComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/ThicknessRingComponentSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/ThicknessRingComponentSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/ThicknessRingComponentSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/TrapezoidFinSetSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/TrapezoidFinSetSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/TrapezoidFinSetSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/TrapezoidFinSetSaver.java diff --git a/src/net/sf/openrocket/file/openrocket/savers/TubeCouplerSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/TubeCouplerSaver.java similarity index 100% rename from src/net/sf/openrocket/file/openrocket/savers/TubeCouplerSaver.java rename to core/src/net/sf/openrocket/file/openrocket/savers/TubeCouplerSaver.java diff --git a/src/net/sf/openrocket/file/rocksim/TipShapeCode.java b/core/src/net/sf/openrocket/file/rocksim/TipShapeCode.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/TipShapeCode.java rename to core/src/net/sf/openrocket/file/rocksim/TipShapeCode.java diff --git a/src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/AbstractTransitionDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/BasePartDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/BodyTubeDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/BodyTubeDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/BodyTubeDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/BodyTubeDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/BulkheadDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/BulkheadDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/BulkheadDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/BulkheadDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/CenteringRingDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/CenteringRingDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/CenteringRingDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/CenteringRingDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/CustomFinSetDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/CustomFinSetDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/CustomFinSetDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/CustomFinSetDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/EngineBlockDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/EngineBlockDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/EngineBlockDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/EngineBlockDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/FinSetDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/FinSetDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/FinSetDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/FinSetDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/LaunchLugDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/LaunchLugDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/LaunchLugDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/LaunchLugDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/MassObjectDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/NoseConeDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/NoseConeDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/NoseConeDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/NoseConeDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/ParachuteDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/ParachuteDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/ParachuteDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/ParachuteDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/RocketDesignDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/RocketDesignDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/RocketDesignDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/RocketDesignDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/RocksimDesignDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/RocksimDesignDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/RocksimDesignDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/RocksimDesignDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java b/core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java rename to core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java diff --git a/src/net/sf/openrocket/file/rocksim/export/StageDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/StageDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/StageDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/StageDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/StreamerDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/StreamerDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/StreamerDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/StreamerDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/TransitionDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/TransitionDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/TransitionDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/TransitionDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/export/TubeCouplerDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/TubeCouplerDTO.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/export/TubeCouplerDTO.java rename to core/src/net/sf/openrocket/file/rocksim/export/TubeCouplerDTO.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RingHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/RingHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RingHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RingHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RocksimDensityType.java b/core/src/net/sf/openrocket/file/rocksim/importt/RocksimDensityType.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RocksimDensityType.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RocksimDensityType.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RocksimFinishCode.java b/core/src/net/sf/openrocket/file/rocksim/importt/RocksimFinishCode.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RocksimFinishCode.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RocksimFinishCode.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RocksimHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/RocksimHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RocksimHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RocksimHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RocksimLoader.java b/core/src/net/sf/openrocket/file/rocksim/importt/RocksimLoader.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RocksimLoader.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RocksimLoader.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RocksimLocationMode.java b/core/src/net/sf/openrocket/file/rocksim/importt/RocksimLocationMode.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RocksimLocationMode.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RocksimLocationMode.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/RocksimNoseConeCode.java b/core/src/net/sf/openrocket/file/rocksim/importt/RocksimNoseConeCode.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/RocksimNoseConeCode.java rename to core/src/net/sf/openrocket/file/rocksim/importt/RocksimNoseConeCode.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java diff --git a/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java similarity index 100% rename from src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java rename to core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java diff --git a/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java similarity index 100% rename from src/net/sf/openrocket/file/simplesax/DelegatorHandler.java rename to core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java diff --git a/src/net/sf/openrocket/file/simplesax/ElementHandler.java b/core/src/net/sf/openrocket/file/simplesax/ElementHandler.java similarity index 100% rename from src/net/sf/openrocket/file/simplesax/ElementHandler.java rename to core/src/net/sf/openrocket/file/simplesax/ElementHandler.java diff --git a/src/net/sf/openrocket/file/simplesax/NullElementHandler.java b/core/src/net/sf/openrocket/file/simplesax/NullElementHandler.java similarity index 100% rename from src/net/sf/openrocket/file/simplesax/NullElementHandler.java rename to core/src/net/sf/openrocket/file/simplesax/NullElementHandler.java diff --git a/src/net/sf/openrocket/file/simplesax/PlainTextHandler.java b/core/src/net/sf/openrocket/file/simplesax/PlainTextHandler.java similarity index 100% rename from src/net/sf/openrocket/file/simplesax/PlainTextHandler.java rename to core/src/net/sf/openrocket/file/simplesax/PlainTextHandler.java diff --git a/src/net/sf/openrocket/file/simplesax/SimpleSAX.java b/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java similarity index 100% rename from src/net/sf/openrocket/file/simplesax/SimpleSAX.java rename to core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java diff --git a/src/net/sf/openrocket/gui/Resettable.java b/core/src/net/sf/openrocket/gui/Resettable.java similarity index 100% rename from src/net/sf/openrocket/gui/Resettable.java rename to core/src/net/sf/openrocket/gui/Resettable.java diff --git a/src/net/sf/openrocket/gui/SpinnerEditor.java b/core/src/net/sf/openrocket/gui/SpinnerEditor.java similarity index 100% rename from src/net/sf/openrocket/gui/SpinnerEditor.java rename to core/src/net/sf/openrocket/gui/SpinnerEditor.java diff --git a/src/net/sf/openrocket/gui/StorageOptionChooser.java b/core/src/net/sf/openrocket/gui/StorageOptionChooser.java similarity index 100% rename from src/net/sf/openrocket/gui/StorageOptionChooser.java rename to core/src/net/sf/openrocket/gui/StorageOptionChooser.java diff --git a/src/net/sf/openrocket/gui/TextFieldListener.java b/core/src/net/sf/openrocket/gui/TextFieldListener.java similarity index 100% rename from src/net/sf/openrocket/gui/TextFieldListener.java rename to core/src/net/sf/openrocket/gui/TextFieldListener.java diff --git a/src/net/sf/openrocket/gui/adaptors/BooleanModel.java b/core/src/net/sf/openrocket/gui/adaptors/BooleanModel.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/BooleanModel.java rename to core/src/net/sf/openrocket/gui/adaptors/BooleanModel.java diff --git a/src/net/sf/openrocket/gui/adaptors/Column.java b/core/src/net/sf/openrocket/gui/adaptors/Column.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/Column.java rename to core/src/net/sf/openrocket/gui/adaptors/Column.java diff --git a/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java b/core/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java rename to core/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java diff --git a/src/net/sf/openrocket/gui/adaptors/DoubleModel.java b/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/DoubleModel.java rename to core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java diff --git a/src/net/sf/openrocket/gui/adaptors/EnumModel.java b/core/src/net/sf/openrocket/gui/adaptors/EnumModel.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/EnumModel.java rename to core/src/net/sf/openrocket/gui/adaptors/EnumModel.java diff --git a/src/net/sf/openrocket/gui/adaptors/IntegerModel.java b/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/IntegerModel.java rename to core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java diff --git a/src/net/sf/openrocket/gui/adaptors/MaterialModel.java b/core/src/net/sf/openrocket/gui/adaptors/MaterialModel.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/MaterialModel.java rename to core/src/net/sf/openrocket/gui/adaptors/MaterialModel.java diff --git a/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java b/core/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java similarity index 100% rename from src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java rename to core/src/net/sf/openrocket/gui/adaptors/MotorConfigurationModel.java diff --git a/src/net/sf/openrocket/gui/components/BasicSlider.java b/core/src/net/sf/openrocket/gui/components/BasicSlider.java similarity index 100% rename from src/net/sf/openrocket/gui/components/BasicSlider.java rename to core/src/net/sf/openrocket/gui/components/BasicSlider.java diff --git a/src/net/sf/openrocket/gui/components/BasicTree.java b/core/src/net/sf/openrocket/gui/components/BasicTree.java similarity index 100% rename from src/net/sf/openrocket/gui/components/BasicTree.java rename to core/src/net/sf/openrocket/gui/components/BasicTree.java diff --git a/src/net/sf/openrocket/gui/components/CollectionTable.java b/core/src/net/sf/openrocket/gui/components/CollectionTable.java similarity index 100% rename from src/net/sf/openrocket/gui/components/CollectionTable.java rename to core/src/net/sf/openrocket/gui/components/CollectionTable.java diff --git a/src/net/sf/openrocket/gui/components/ColorChooser.java b/core/src/net/sf/openrocket/gui/components/ColorChooser.java similarity index 100% rename from src/net/sf/openrocket/gui/components/ColorChooser.java rename to core/src/net/sf/openrocket/gui/components/ColorChooser.java diff --git a/src/net/sf/openrocket/gui/components/ColorChooserButton.java b/core/src/net/sf/openrocket/gui/components/ColorChooserButton.java similarity index 100% rename from src/net/sf/openrocket/gui/components/ColorChooserButton.java rename to core/src/net/sf/openrocket/gui/components/ColorChooserButton.java diff --git a/src/net/sf/openrocket/gui/components/ColorIcon.java b/core/src/net/sf/openrocket/gui/components/ColorIcon.java similarity index 100% rename from src/net/sf/openrocket/gui/components/ColorIcon.java rename to core/src/net/sf/openrocket/gui/components/ColorIcon.java diff --git a/src/net/sf/openrocket/gui/components/CsvOptionPanel.java b/core/src/net/sf/openrocket/gui/components/CsvOptionPanel.java similarity index 100% rename from src/net/sf/openrocket/gui/components/CsvOptionPanel.java rename to core/src/net/sf/openrocket/gui/components/CsvOptionPanel.java diff --git a/src/net/sf/openrocket/gui/components/DescriptionArea.java b/core/src/net/sf/openrocket/gui/components/DescriptionArea.java similarity index 100% rename from src/net/sf/openrocket/gui/components/DescriptionArea.java rename to core/src/net/sf/openrocket/gui/components/DescriptionArea.java diff --git a/src/net/sf/openrocket/gui/components/DoubleCellEditor.java b/core/src/net/sf/openrocket/gui/components/DoubleCellEditor.java similarity index 100% rename from src/net/sf/openrocket/gui/components/DoubleCellEditor.java rename to core/src/net/sf/openrocket/gui/components/DoubleCellEditor.java diff --git a/src/net/sf/openrocket/gui/components/FlatButton.java b/core/src/net/sf/openrocket/gui/components/FlatButton.java similarity index 100% rename from src/net/sf/openrocket/gui/components/FlatButton.java rename to core/src/net/sf/openrocket/gui/components/FlatButton.java diff --git a/src/net/sf/openrocket/gui/components/HtmlLabel.java b/core/src/net/sf/openrocket/gui/components/HtmlLabel.java similarity index 100% rename from src/net/sf/openrocket/gui/components/HtmlLabel.java rename to core/src/net/sf/openrocket/gui/components/HtmlLabel.java diff --git a/src/net/sf/openrocket/gui/components/ImageDisplayComponent.java b/core/src/net/sf/openrocket/gui/components/ImageDisplayComponent.java similarity index 100% rename from src/net/sf/openrocket/gui/components/ImageDisplayComponent.java rename to core/src/net/sf/openrocket/gui/components/ImageDisplayComponent.java diff --git a/src/net/sf/openrocket/gui/components/SelectableLabel.java b/core/src/net/sf/openrocket/gui/components/SelectableLabel.java similarity index 100% rename from src/net/sf/openrocket/gui/components/SelectableLabel.java rename to core/src/net/sf/openrocket/gui/components/SelectableLabel.java diff --git a/src/net/sf/openrocket/gui/components/SimulationExportPanel.java b/core/src/net/sf/openrocket/gui/components/SimulationExportPanel.java similarity index 100% rename from src/net/sf/openrocket/gui/components/SimulationExportPanel.java rename to core/src/net/sf/openrocket/gui/components/SimulationExportPanel.java diff --git a/src/net/sf/openrocket/gui/components/StageSelector.java b/core/src/net/sf/openrocket/gui/components/StageSelector.java similarity index 100% rename from src/net/sf/openrocket/gui/components/StageSelector.java rename to core/src/net/sf/openrocket/gui/components/StageSelector.java diff --git a/src/net/sf/openrocket/gui/components/StyledLabel.java b/core/src/net/sf/openrocket/gui/components/StyledLabel.java similarity index 100% rename from src/net/sf/openrocket/gui/components/StyledLabel.java rename to core/src/net/sf/openrocket/gui/components/StyledLabel.java diff --git a/src/net/sf/openrocket/gui/components/URLLabel.java b/core/src/net/sf/openrocket/gui/components/URLLabel.java similarity index 100% rename from src/net/sf/openrocket/gui/components/URLLabel.java rename to core/src/net/sf/openrocket/gui/components/URLLabel.java diff --git a/src/net/sf/openrocket/gui/components/UnitCellEditor.java b/core/src/net/sf/openrocket/gui/components/UnitCellEditor.java similarity index 100% rename from src/net/sf/openrocket/gui/components/UnitCellEditor.java rename to core/src/net/sf/openrocket/gui/components/UnitCellEditor.java diff --git a/src/net/sf/openrocket/gui/components/UnitSelector.java b/core/src/net/sf/openrocket/gui/components/UnitSelector.java similarity index 100% rename from src/net/sf/openrocket/gui/components/UnitSelector.java rename to core/src/net/sf/openrocket/gui/components/UnitSelector.java diff --git a/src/net/sf/openrocket/gui/components/compass/CompassPointer.java b/core/src/net/sf/openrocket/gui/components/compass/CompassPointer.java similarity index 100% rename from src/net/sf/openrocket/gui/components/compass/CompassPointer.java rename to core/src/net/sf/openrocket/gui/components/compass/CompassPointer.java diff --git a/src/net/sf/openrocket/gui/components/compass/CompassRose.java b/core/src/net/sf/openrocket/gui/components/compass/CompassRose.java similarity index 100% rename from src/net/sf/openrocket/gui/components/compass/CompassRose.java rename to core/src/net/sf/openrocket/gui/components/compass/CompassRose.java diff --git a/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java b/core/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java similarity index 100% rename from src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java rename to core/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java diff --git a/src/net/sf/openrocket/gui/components/compass/CompassSelector.java b/core/src/net/sf/openrocket/gui/components/compass/CompassSelector.java similarity index 100% rename from src/net/sf/openrocket/gui/components/compass/CompassSelector.java rename to core/src/net/sf/openrocket/gui/components/compass/CompassSelector.java diff --git a/src/net/sf/openrocket/gui/components/compass/Tester.java b/core/src/net/sf/openrocket/gui/components/compass/Tester.java similarity index 100% rename from src/net/sf/openrocket/gui/components/compass/Tester.java rename to core/src/net/sf/openrocket/gui/components/compass/Tester.java diff --git a/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java b/core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java b/core/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java b/core/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java b/core/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java rename to core/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java diff --git a/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java b/core/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java b/core/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/FinSetConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/core/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java b/core/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java b/core/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java b/core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/MotorConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java b/core/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/core/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/core/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/RocketConfig.java b/core/src/net/sf/openrocket/gui/configdialog/RocketConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/RocketConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/RocketConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java b/core/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java b/core/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/SleeveConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/StreamerConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java b/core/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/core/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/TransitionConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java diff --git a/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java b/core/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java similarity index 100% rename from src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java rename to core/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java diff --git a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/AboutDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/core/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/BugReportDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java b/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java b/core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/DetailDialog.java b/core/src/net/sf/openrocket/gui/dialogs/DetailDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/DetailDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/DetailDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java b/core/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java b/core/src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java b/core/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/LicenseDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java b/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/PrintDialog.java b/core/src/net/sf/openrocket/gui/dialogs/PrintDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/PrintDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/PrintDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java b/core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java b/core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/ScaleDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java b/core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java b/core/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/WarningDialog.java b/core/src/net/sf/openrocket/gui/dialogs/WarningDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/WarningDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/WarningDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java b/core/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java b/core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java b/core/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java rename to core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java rename to core/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java rename to core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java rename to core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java rename to core/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java diff --git a/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java b/core/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java rename to core/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java diff --git a/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java rename to core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java diff --git a/src/net/sf/openrocket/gui/figureelements/CGCaret.java b/core/src/net/sf/openrocket/gui/figureelements/CGCaret.java similarity index 100% rename from src/net/sf/openrocket/gui/figureelements/CGCaret.java rename to core/src/net/sf/openrocket/gui/figureelements/CGCaret.java diff --git a/src/net/sf/openrocket/gui/figureelements/CPCaret.java b/core/src/net/sf/openrocket/gui/figureelements/CPCaret.java similarity index 100% rename from src/net/sf/openrocket/gui/figureelements/CPCaret.java rename to core/src/net/sf/openrocket/gui/figureelements/CPCaret.java diff --git a/src/net/sf/openrocket/gui/figureelements/Caret.java b/core/src/net/sf/openrocket/gui/figureelements/Caret.java similarity index 100% rename from src/net/sf/openrocket/gui/figureelements/Caret.java rename to core/src/net/sf/openrocket/gui/figureelements/Caret.java diff --git a/src/net/sf/openrocket/gui/figureelements/FigureElement.java b/core/src/net/sf/openrocket/gui/figureelements/FigureElement.java similarity index 100% rename from src/net/sf/openrocket/gui/figureelements/FigureElement.java rename to core/src/net/sf/openrocket/gui/figureelements/FigureElement.java diff --git a/src/net/sf/openrocket/gui/figureelements/RocketInfo.java b/core/src/net/sf/openrocket/gui/figureelements/RocketInfo.java similarity index 100% rename from src/net/sf/openrocket/gui/figureelements/RocketInfo.java rename to core/src/net/sf/openrocket/gui/figureelements/RocketInfo.java diff --git a/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java b/core/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java rename to core/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java diff --git a/src/net/sf/openrocket/gui/help/tours/Slide.java b/core/src/net/sf/openrocket/gui/help/tours/Slide.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/Slide.java rename to core/src/net/sf/openrocket/gui/help/tours/Slide.java diff --git a/src/net/sf/openrocket/gui/help/tours/SlideSet.java b/core/src/net/sf/openrocket/gui/help/tours/SlideSet.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/SlideSet.java rename to core/src/net/sf/openrocket/gui/help/tours/SlideSet.java diff --git a/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java b/core/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java rename to core/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java diff --git a/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java b/core/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/SlideSetManager.java rename to core/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java diff --git a/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java b/core/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java rename to core/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java diff --git a/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java b/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java rename to core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java diff --git a/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java b/core/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java rename to core/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java diff --git a/src/net/sf/openrocket/gui/help/tours/TextLineReader.java b/core/src/net/sf/openrocket/gui/help/tours/TextLineReader.java similarity index 100% rename from src/net/sf/openrocket/gui/help/tours/TextLineReader.java rename to core/src/net/sf/openrocket/gui/help/tours/TextLineReader.java diff --git a/src/net/sf/openrocket/gui/main/BasicFrame.java b/core/src/net/sf/openrocket/gui/main/BasicFrame.java similarity index 100% rename from src/net/sf/openrocket/gui/main/BasicFrame.java rename to core/src/net/sf/openrocket/gui/main/BasicFrame.java diff --git a/src/net/sf/openrocket/gui/main/ClipboardListener.java b/core/src/net/sf/openrocket/gui/main/ClipboardListener.java similarity index 100% rename from src/net/sf/openrocket/gui/main/ClipboardListener.java rename to core/src/net/sf/openrocket/gui/main/ClipboardListener.java diff --git a/src/net/sf/openrocket/gui/main/ComponentAddButtons.java b/core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java similarity index 100% rename from src/net/sf/openrocket/gui/main/ComponentAddButtons.java rename to core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java diff --git a/src/net/sf/openrocket/gui/main/ComponentIcons.java b/core/src/net/sf/openrocket/gui/main/ComponentIcons.java similarity index 100% rename from src/net/sf/openrocket/gui/main/ComponentIcons.java rename to core/src/net/sf/openrocket/gui/main/ComponentIcons.java diff --git a/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java b/core/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java similarity index 100% rename from src/net/sf/openrocket/gui/main/DocumentSelectionListener.java rename to core/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java diff --git a/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java b/core/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java similarity index 100% rename from src/net/sf/openrocket/gui/main/DocumentSelectionModel.java rename to core/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java diff --git a/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java b/core/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java similarity index 100% rename from src/net/sf/openrocket/gui/main/OpenRocketClipboard.java rename to core/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java diff --git a/src/net/sf/openrocket/gui/main/RocketActions.java b/core/src/net/sf/openrocket/gui/main/RocketActions.java similarity index 100% rename from src/net/sf/openrocket/gui/main/RocketActions.java rename to core/src/net/sf/openrocket/gui/main/RocketActions.java diff --git a/src/net/sf/openrocket/gui/main/SimulationEditDialog.java b/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/main/SimulationEditDialog.java rename to core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java diff --git a/src/net/sf/openrocket/gui/main/SimulationPanel.java b/core/src/net/sf/openrocket/gui/main/SimulationPanel.java similarity index 100% rename from src/net/sf/openrocket/gui/main/SimulationPanel.java rename to core/src/net/sf/openrocket/gui/main/SimulationPanel.java diff --git a/src/net/sf/openrocket/gui/main/SimulationRunDialog.java b/core/src/net/sf/openrocket/gui/main/SimulationRunDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/main/SimulationRunDialog.java rename to core/src/net/sf/openrocket/gui/main/SimulationRunDialog.java diff --git a/src/net/sf/openrocket/gui/main/SimulationWorker.java b/core/src/net/sf/openrocket/gui/main/SimulationWorker.java similarity index 100% rename from src/net/sf/openrocket/gui/main/SimulationWorker.java rename to core/src/net/sf/openrocket/gui/main/SimulationWorker.java diff --git a/src/net/sf/openrocket/gui/main/Splash.java b/core/src/net/sf/openrocket/gui/main/Splash.java similarity index 100% rename from src/net/sf/openrocket/gui/main/Splash.java rename to core/src/net/sf/openrocket/gui/main/Splash.java diff --git a/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java b/core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java similarity index 100% rename from src/net/sf/openrocket/gui/main/SwingExceptionHandler.java rename to core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java diff --git a/src/net/sf/openrocket/gui/main/UndoRedoAction.java b/core/src/net/sf/openrocket/gui/main/UndoRedoAction.java similarity index 100% rename from src/net/sf/openrocket/gui/main/UndoRedoAction.java rename to core/src/net/sf/openrocket/gui/main/UndoRedoAction.java diff --git a/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java similarity index 100% rename from src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java rename to core/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java diff --git a/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java similarity index 100% rename from src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java rename to core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java diff --git a/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java similarity index 100% rename from src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java rename to core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java diff --git a/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java similarity index 100% rename from src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java rename to core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java diff --git a/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java b/core/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java similarity index 100% rename from src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java rename to core/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java diff --git a/src/net/sf/openrocket/gui/plot/Axis.java b/core/src/net/sf/openrocket/gui/plot/Axis.java similarity index 100% rename from src/net/sf/openrocket/gui/plot/Axis.java rename to core/src/net/sf/openrocket/gui/plot/Axis.java diff --git a/src/net/sf/openrocket/gui/plot/PlotConfiguration.java b/core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java similarity index 100% rename from src/net/sf/openrocket/gui/plot/PlotConfiguration.java rename to core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java diff --git a/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java b/core/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java rename to core/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java diff --git a/src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java b/core/src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java similarity index 100% rename from src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java rename to core/src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java diff --git a/src/net/sf/openrocket/gui/print/AbstractPrintableTransition.java b/core/src/net/sf/openrocket/gui/print/AbstractPrintableTransition.java similarity index 100% rename from src/net/sf/openrocket/gui/print/AbstractPrintableTransition.java rename to core/src/net/sf/openrocket/gui/print/AbstractPrintableTransition.java diff --git a/src/net/sf/openrocket/gui/print/ConceptPrintDialog.java b/core/src/net/sf/openrocket/gui/print/ConceptPrintDialog.java similarity index 100% rename from src/net/sf/openrocket/gui/print/ConceptPrintDialog.java rename to core/src/net/sf/openrocket/gui/print/ConceptPrintDialog.java diff --git a/src/net/sf/openrocket/gui/print/DesignReport.java b/core/src/net/sf/openrocket/gui/print/DesignReport.java similarity index 100% rename from src/net/sf/openrocket/gui/print/DesignReport.java rename to core/src/net/sf/openrocket/gui/print/DesignReport.java diff --git a/src/net/sf/openrocket/gui/print/FinMarkingGuide.java b/core/src/net/sf/openrocket/gui/print/FinMarkingGuide.java similarity index 100% rename from src/net/sf/openrocket/gui/print/FinMarkingGuide.java rename to core/src/net/sf/openrocket/gui/print/FinMarkingGuide.java diff --git a/src/net/sf/openrocket/gui/print/ITextHelper.java b/core/src/net/sf/openrocket/gui/print/ITextHelper.java similarity index 100% rename from src/net/sf/openrocket/gui/print/ITextHelper.java rename to core/src/net/sf/openrocket/gui/print/ITextHelper.java diff --git a/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java b/core/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java similarity index 100% rename from src/net/sf/openrocket/gui/print/OpenRocketPrintable.java rename to core/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java diff --git a/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java b/core/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java rename to core/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java diff --git a/src/net/sf/openrocket/gui/print/PaperOrientation.java b/core/src/net/sf/openrocket/gui/print/PaperOrientation.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PaperOrientation.java rename to core/src/net/sf/openrocket/gui/print/PaperOrientation.java diff --git a/src/net/sf/openrocket/gui/print/PaperSize.java b/core/src/net/sf/openrocket/gui/print/PaperSize.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PaperSize.java rename to core/src/net/sf/openrocket/gui/print/PaperSize.java diff --git a/src/net/sf/openrocket/gui/print/PrintController.java b/core/src/net/sf/openrocket/gui/print/PrintController.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintController.java rename to core/src/net/sf/openrocket/gui/print/PrintController.java diff --git a/src/net/sf/openrocket/gui/print/PrintFigure.java b/core/src/net/sf/openrocket/gui/print/PrintFigure.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintFigure.java rename to core/src/net/sf/openrocket/gui/print/PrintFigure.java diff --git a/src/net/sf/openrocket/gui/print/PrintSettings.java b/core/src/net/sf/openrocket/gui/print/PrintSettings.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintSettings.java rename to core/src/net/sf/openrocket/gui/print/PrintSettings.java diff --git a/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java b/core/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintSimulationWorker.java rename to core/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java diff --git a/src/net/sf/openrocket/gui/print/PrintUnit.java b/core/src/net/sf/openrocket/gui/print/PrintUnit.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintUnit.java rename to core/src/net/sf/openrocket/gui/print/PrintUnit.java diff --git a/src/net/sf/openrocket/gui/print/PrintUtilities.java b/core/src/net/sf/openrocket/gui/print/PrintUtilities.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintUtilities.java rename to core/src/net/sf/openrocket/gui/print/PrintUtilities.java diff --git a/src/net/sf/openrocket/gui/print/PrintableContext.java b/core/src/net/sf/openrocket/gui/print/PrintableContext.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintableContext.java rename to core/src/net/sf/openrocket/gui/print/PrintableContext.java diff --git a/src/net/sf/openrocket/gui/print/PrintableFinSet.java b/core/src/net/sf/openrocket/gui/print/PrintableFinSet.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintableFinSet.java rename to core/src/net/sf/openrocket/gui/print/PrintableFinSet.java diff --git a/src/net/sf/openrocket/gui/print/PrintableNoseCone.java b/core/src/net/sf/openrocket/gui/print/PrintableNoseCone.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintableNoseCone.java rename to core/src/net/sf/openrocket/gui/print/PrintableNoseCone.java diff --git a/src/net/sf/openrocket/gui/print/PrintableTransition.java b/core/src/net/sf/openrocket/gui/print/PrintableTransition.java similarity index 100% rename from src/net/sf/openrocket/gui/print/PrintableTransition.java rename to core/src/net/sf/openrocket/gui/print/PrintableTransition.java diff --git a/src/net/sf/openrocket/gui/print/TemplateProperties.java b/core/src/net/sf/openrocket/gui/print/TemplateProperties.java similarity index 100% rename from src/net/sf/openrocket/gui/print/TemplateProperties.java rename to core/src/net/sf/openrocket/gui/print/TemplateProperties.java diff --git a/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java b/core/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java similarity index 100% rename from src/net/sf/openrocket/gui/print/components/CheckBoxNode.java rename to core/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java diff --git a/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java b/core/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java similarity index 100% rename from src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java rename to core/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java diff --git a/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java b/core/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java similarity index 100% rename from src/net/sf/openrocket/gui/print/components/CheckTreeManager.java rename to core/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java diff --git a/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java b/core/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java similarity index 100% rename from src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java rename to core/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java diff --git a/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java b/core/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java similarity index 100% rename from src/net/sf/openrocket/gui/print/components/RocketPrintTree.java rename to core/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java diff --git a/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java similarity index 100% rename from src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java rename to core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java diff --git a/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java similarity index 100% rename from src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java rename to core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java diff --git a/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java similarity index 100% rename from src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java rename to core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java diff --git a/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java similarity index 100% rename from src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java rename to core/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java diff --git a/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java similarity index 100% rename from src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java rename to core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java diff --git a/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java b/core/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java similarity index 100% rename from src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java rename to core/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java diff --git a/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java b/core/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java similarity index 100% rename from src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java rename to core/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java diff --git a/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java b/core/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java similarity index 100% rename from src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java rename to core/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java diff --git a/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java b/core/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java similarity index 100% rename from src/net/sf/openrocket/gui/scalefigure/RocketFigure.java rename to core/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java diff --git a/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java similarity index 100% rename from src/net/sf/openrocket/gui/scalefigure/RocketPanel.java rename to core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java diff --git a/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java b/core/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java similarity index 100% rename from src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java rename to core/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java diff --git a/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java b/core/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java similarity index 100% rename from src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java rename to core/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java diff --git a/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java b/core/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java similarity index 100% rename from src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java rename to core/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java diff --git a/src/net/sf/openrocket/gui/util/ColorConversion.java b/core/src/net/sf/openrocket/gui/util/ColorConversion.java similarity index 100% rename from src/net/sf/openrocket/gui/util/ColorConversion.java rename to core/src/net/sf/openrocket/gui/util/ColorConversion.java diff --git a/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java b/core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java similarity index 100% rename from src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java rename to core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java diff --git a/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java b/core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java similarity index 100% rename from src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java rename to core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java diff --git a/src/net/sf/openrocket/gui/util/FileHelper.java b/core/src/net/sf/openrocket/gui/util/FileHelper.java similarity index 100% rename from src/net/sf/openrocket/gui/util/FileHelper.java rename to core/src/net/sf/openrocket/gui/util/FileHelper.java diff --git a/src/net/sf/openrocket/gui/util/GUIUtil.java b/core/src/net/sf/openrocket/gui/util/GUIUtil.java similarity index 100% rename from src/net/sf/openrocket/gui/util/GUIUtil.java rename to core/src/net/sf/openrocket/gui/util/GUIUtil.java diff --git a/src/net/sf/openrocket/gui/util/Icons.java b/core/src/net/sf/openrocket/gui/util/Icons.java similarity index 100% rename from src/net/sf/openrocket/gui/util/Icons.java rename to core/src/net/sf/openrocket/gui/util/Icons.java diff --git a/src/net/sf/openrocket/gui/util/OpenFileWorker.java b/core/src/net/sf/openrocket/gui/util/OpenFileWorker.java similarity index 100% rename from src/net/sf/openrocket/gui/util/OpenFileWorker.java rename to core/src/net/sf/openrocket/gui/util/OpenFileWorker.java diff --git a/src/net/sf/openrocket/gui/util/ProgressOutputStream.java b/core/src/net/sf/openrocket/gui/util/ProgressOutputStream.java similarity index 100% rename from src/net/sf/openrocket/gui/util/ProgressOutputStream.java rename to core/src/net/sf/openrocket/gui/util/ProgressOutputStream.java diff --git a/src/net/sf/openrocket/gui/util/SaveCSVWorker.java b/core/src/net/sf/openrocket/gui/util/SaveCSVWorker.java similarity index 100% rename from src/net/sf/openrocket/gui/util/SaveCSVWorker.java rename to core/src/net/sf/openrocket/gui/util/SaveCSVWorker.java diff --git a/src/net/sf/openrocket/gui/util/SaveFileWorker.java b/core/src/net/sf/openrocket/gui/util/SaveFileWorker.java similarity index 100% rename from src/net/sf/openrocket/gui/util/SaveFileWorker.java rename to core/src/net/sf/openrocket/gui/util/SaveFileWorker.java diff --git a/src/net/sf/openrocket/gui/util/SimpleFileFilter.java b/core/src/net/sf/openrocket/gui/util/SimpleFileFilter.java similarity index 100% rename from src/net/sf/openrocket/gui/util/SimpleFileFilter.java rename to core/src/net/sf/openrocket/gui/util/SimpleFileFilter.java diff --git a/src/net/sf/openrocket/gui/util/SwingPreferences.java b/core/src/net/sf/openrocket/gui/util/SwingPreferences.java similarity index 100% rename from src/net/sf/openrocket/gui/util/SwingPreferences.java rename to core/src/net/sf/openrocket/gui/util/SwingPreferences.java diff --git a/src/net/sf/openrocket/l10n/ClassBasedTranslator.java b/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java similarity index 100% rename from src/net/sf/openrocket/l10n/ClassBasedTranslator.java rename to core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java diff --git a/src/net/sf/openrocket/l10n/DebugTranslator.java b/core/src/net/sf/openrocket/l10n/DebugTranslator.java similarity index 100% rename from src/net/sf/openrocket/l10n/DebugTranslator.java rename to core/src/net/sf/openrocket/l10n/DebugTranslator.java diff --git a/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java b/core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java similarity index 100% rename from src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java rename to core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java diff --git a/src/net/sf/openrocket/l10n/L10N.java b/core/src/net/sf/openrocket/l10n/L10N.java similarity index 100% rename from src/net/sf/openrocket/l10n/L10N.java rename to core/src/net/sf/openrocket/l10n/L10N.java diff --git a/src/net/sf/openrocket/l10n/ResourceBundleTranslator.java b/core/src/net/sf/openrocket/l10n/ResourceBundleTranslator.java similarity index 100% rename from src/net/sf/openrocket/l10n/ResourceBundleTranslator.java rename to core/src/net/sf/openrocket/l10n/ResourceBundleTranslator.java diff --git a/src/net/sf/openrocket/l10n/Translator.java b/core/src/net/sf/openrocket/l10n/Translator.java similarity index 100% rename from src/net/sf/openrocket/l10n/Translator.java rename to core/src/net/sf/openrocket/l10n/Translator.java diff --git a/src/net/sf/openrocket/logging/BufferLogger.java b/core/src/net/sf/openrocket/logging/BufferLogger.java similarity index 100% rename from src/net/sf/openrocket/logging/BufferLogger.java rename to core/src/net/sf/openrocket/logging/BufferLogger.java diff --git a/src/net/sf/openrocket/logging/CyclicBuffer.java b/core/src/net/sf/openrocket/logging/CyclicBuffer.java similarity index 100% rename from src/net/sf/openrocket/logging/CyclicBuffer.java rename to core/src/net/sf/openrocket/logging/CyclicBuffer.java diff --git a/src/net/sf/openrocket/logging/DelegatorLogger.java b/core/src/net/sf/openrocket/logging/DelegatorLogger.java similarity index 100% rename from src/net/sf/openrocket/logging/DelegatorLogger.java rename to core/src/net/sf/openrocket/logging/DelegatorLogger.java diff --git a/src/net/sf/openrocket/logging/LogHelper.java b/core/src/net/sf/openrocket/logging/LogHelper.java similarity index 100% rename from src/net/sf/openrocket/logging/LogHelper.java rename to core/src/net/sf/openrocket/logging/LogHelper.java diff --git a/src/net/sf/openrocket/logging/LogLevel.java b/core/src/net/sf/openrocket/logging/LogLevel.java similarity index 100% rename from src/net/sf/openrocket/logging/LogLevel.java rename to core/src/net/sf/openrocket/logging/LogLevel.java diff --git a/src/net/sf/openrocket/logging/LogLevelBufferLogger.java b/core/src/net/sf/openrocket/logging/LogLevelBufferLogger.java similarity index 100% rename from src/net/sf/openrocket/logging/LogLevelBufferLogger.java rename to core/src/net/sf/openrocket/logging/LogLevelBufferLogger.java diff --git a/src/net/sf/openrocket/logging/LogLine.java b/core/src/net/sf/openrocket/logging/LogLine.java similarity index 100% rename from src/net/sf/openrocket/logging/LogLine.java rename to core/src/net/sf/openrocket/logging/LogLine.java diff --git a/src/net/sf/openrocket/logging/PrintStreamLogger.java b/core/src/net/sf/openrocket/logging/PrintStreamLogger.java similarity index 100% rename from src/net/sf/openrocket/logging/PrintStreamLogger.java rename to core/src/net/sf/openrocket/logging/PrintStreamLogger.java diff --git a/src/net/sf/openrocket/logging/StackTraceWriter.java b/core/src/net/sf/openrocket/logging/StackTraceWriter.java similarity index 100% rename from src/net/sf/openrocket/logging/StackTraceWriter.java rename to core/src/net/sf/openrocket/logging/StackTraceWriter.java diff --git a/src/net/sf/openrocket/logging/TraceException.java b/core/src/net/sf/openrocket/logging/TraceException.java similarity index 100% rename from src/net/sf/openrocket/logging/TraceException.java rename to core/src/net/sf/openrocket/logging/TraceException.java diff --git a/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java b/core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java similarity index 100% rename from src/net/sf/openrocket/masscalc/AbstractMassCalculator.java rename to core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java diff --git a/src/net/sf/openrocket/masscalc/BasicMassCalculator.java b/core/src/net/sf/openrocket/masscalc/BasicMassCalculator.java similarity index 100% rename from src/net/sf/openrocket/masscalc/BasicMassCalculator.java rename to core/src/net/sf/openrocket/masscalc/BasicMassCalculator.java diff --git a/src/net/sf/openrocket/masscalc/MassCalculator.java b/core/src/net/sf/openrocket/masscalc/MassCalculator.java similarity index 100% rename from src/net/sf/openrocket/masscalc/MassCalculator.java rename to core/src/net/sf/openrocket/masscalc/MassCalculator.java diff --git a/src/net/sf/openrocket/material/Material.java b/core/src/net/sf/openrocket/material/Material.java similarity index 100% rename from src/net/sf/openrocket/material/Material.java rename to core/src/net/sf/openrocket/material/Material.java diff --git a/src/net/sf/openrocket/material/MaterialStorage.java b/core/src/net/sf/openrocket/material/MaterialStorage.java similarity index 100% rename from src/net/sf/openrocket/material/MaterialStorage.java rename to core/src/net/sf/openrocket/material/MaterialStorage.java diff --git a/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java b/core/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java similarity index 100% rename from src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java rename to core/src/net/sf/openrocket/models/atmosphere/AtmosphericConditions.java diff --git a/src/net/sf/openrocket/models/atmosphere/AtmosphericModel.java b/core/src/net/sf/openrocket/models/atmosphere/AtmosphericModel.java similarity index 100% rename from src/net/sf/openrocket/models/atmosphere/AtmosphericModel.java rename to core/src/net/sf/openrocket/models/atmosphere/AtmosphericModel.java diff --git a/src/net/sf/openrocket/models/atmosphere/ExtendedISAModel.java b/core/src/net/sf/openrocket/models/atmosphere/ExtendedISAModel.java similarity index 100% rename from src/net/sf/openrocket/models/atmosphere/ExtendedISAModel.java rename to core/src/net/sf/openrocket/models/atmosphere/ExtendedISAModel.java diff --git a/src/net/sf/openrocket/models/atmosphere/InterpolatingAtmosphericModel.java b/core/src/net/sf/openrocket/models/atmosphere/InterpolatingAtmosphericModel.java similarity index 100% rename from src/net/sf/openrocket/models/atmosphere/InterpolatingAtmosphericModel.java rename to core/src/net/sf/openrocket/models/atmosphere/InterpolatingAtmosphericModel.java diff --git a/src/net/sf/openrocket/models/gravity/GravityModel.java b/core/src/net/sf/openrocket/models/gravity/GravityModel.java similarity index 100% rename from src/net/sf/openrocket/models/gravity/GravityModel.java rename to core/src/net/sf/openrocket/models/gravity/GravityModel.java diff --git a/src/net/sf/openrocket/models/gravity/WGSGravityModel.java b/core/src/net/sf/openrocket/models/gravity/WGSGravityModel.java similarity index 100% rename from src/net/sf/openrocket/models/gravity/WGSGravityModel.java rename to core/src/net/sf/openrocket/models/gravity/WGSGravityModel.java diff --git a/src/net/sf/openrocket/models/wind/PinkNoiseWindModel.java b/core/src/net/sf/openrocket/models/wind/PinkNoiseWindModel.java similarity index 100% rename from src/net/sf/openrocket/models/wind/PinkNoiseWindModel.java rename to core/src/net/sf/openrocket/models/wind/PinkNoiseWindModel.java diff --git a/src/net/sf/openrocket/models/wind/WindModel.java b/core/src/net/sf/openrocket/models/wind/WindModel.java similarity index 100% rename from src/net/sf/openrocket/models/wind/WindModel.java rename to core/src/net/sf/openrocket/models/wind/WindModel.java diff --git a/src/net/sf/openrocket/motor/DesignationComparator.java b/core/src/net/sf/openrocket/motor/DesignationComparator.java similarity index 100% rename from src/net/sf/openrocket/motor/DesignationComparator.java rename to core/src/net/sf/openrocket/motor/DesignationComparator.java diff --git a/src/net/sf/openrocket/motor/Manufacturer.java b/core/src/net/sf/openrocket/motor/Manufacturer.java similarity index 100% rename from src/net/sf/openrocket/motor/Manufacturer.java rename to core/src/net/sf/openrocket/motor/Manufacturer.java diff --git a/src/net/sf/openrocket/motor/Motor.java b/core/src/net/sf/openrocket/motor/Motor.java similarity index 100% rename from src/net/sf/openrocket/motor/Motor.java rename to core/src/net/sf/openrocket/motor/Motor.java diff --git a/src/net/sf/openrocket/motor/MotorDigest.java b/core/src/net/sf/openrocket/motor/MotorDigest.java similarity index 100% rename from src/net/sf/openrocket/motor/MotorDigest.java rename to core/src/net/sf/openrocket/motor/MotorDigest.java diff --git a/src/net/sf/openrocket/motor/MotorId.java b/core/src/net/sf/openrocket/motor/MotorId.java similarity index 100% rename from src/net/sf/openrocket/motor/MotorId.java rename to core/src/net/sf/openrocket/motor/MotorId.java diff --git a/src/net/sf/openrocket/motor/MotorInstance.java b/core/src/net/sf/openrocket/motor/MotorInstance.java similarity index 100% rename from src/net/sf/openrocket/motor/MotorInstance.java rename to core/src/net/sf/openrocket/motor/MotorInstance.java diff --git a/src/net/sf/openrocket/motor/MotorInstanceConfiguration.java b/core/src/net/sf/openrocket/motor/MotorInstanceConfiguration.java similarity index 100% rename from src/net/sf/openrocket/motor/MotorInstanceConfiguration.java rename to core/src/net/sf/openrocket/motor/MotorInstanceConfiguration.java diff --git a/src/net/sf/openrocket/motor/ThrustCurveMotor.java b/core/src/net/sf/openrocket/motor/ThrustCurveMotor.java similarity index 100% rename from src/net/sf/openrocket/motor/ThrustCurveMotor.java rename to core/src/net/sf/openrocket/motor/ThrustCurveMotor.java diff --git a/src/net/sf/openrocket/optimization/general/Function.java b/core/src/net/sf/openrocket/optimization/general/Function.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/Function.java rename to core/src/net/sf/openrocket/optimization/general/Function.java diff --git a/src/net/sf/openrocket/optimization/general/FunctionCache.java b/core/src/net/sf/openrocket/optimization/general/FunctionCache.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/FunctionCache.java rename to core/src/net/sf/openrocket/optimization/general/FunctionCache.java diff --git a/src/net/sf/openrocket/optimization/general/FunctionOptimizer.java b/core/src/net/sf/openrocket/optimization/general/FunctionOptimizer.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/FunctionOptimizer.java rename to core/src/net/sf/openrocket/optimization/general/FunctionOptimizer.java diff --git a/src/net/sf/openrocket/optimization/general/OptimizationController.java b/core/src/net/sf/openrocket/optimization/general/OptimizationController.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/OptimizationController.java rename to core/src/net/sf/openrocket/optimization/general/OptimizationController.java diff --git a/src/net/sf/openrocket/optimization/general/OptimizationControllerDelegator.java b/core/src/net/sf/openrocket/optimization/general/OptimizationControllerDelegator.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/OptimizationControllerDelegator.java rename to core/src/net/sf/openrocket/optimization/general/OptimizationControllerDelegator.java diff --git a/src/net/sf/openrocket/optimization/general/OptimizationException.java b/core/src/net/sf/openrocket/optimization/general/OptimizationException.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/OptimizationException.java rename to core/src/net/sf/openrocket/optimization/general/OptimizationException.java diff --git a/src/net/sf/openrocket/optimization/general/ParallelExecutorCache.java b/core/src/net/sf/openrocket/optimization/general/ParallelExecutorCache.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/ParallelExecutorCache.java rename to core/src/net/sf/openrocket/optimization/general/ParallelExecutorCache.java diff --git a/src/net/sf/openrocket/optimization/general/ParallelFunctionCache.java b/core/src/net/sf/openrocket/optimization/general/ParallelFunctionCache.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/ParallelFunctionCache.java rename to core/src/net/sf/openrocket/optimization/general/ParallelFunctionCache.java diff --git a/src/net/sf/openrocket/optimization/general/Point.java b/core/src/net/sf/openrocket/optimization/general/Point.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/Point.java rename to core/src/net/sf/openrocket/optimization/general/Point.java diff --git a/src/net/sf/openrocket/optimization/general/multidim/FunctionCacheComparator.java b/core/src/net/sf/openrocket/optimization/general/multidim/FunctionCacheComparator.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/multidim/FunctionCacheComparator.java rename to core/src/net/sf/openrocket/optimization/general/multidim/FunctionCacheComparator.java diff --git a/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java b/core/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java rename to core/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java diff --git a/src/net/sf/openrocket/optimization/general/multidim/SearchPattern.java b/core/src/net/sf/openrocket/optimization/general/multidim/SearchPattern.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/multidim/SearchPattern.java rename to core/src/net/sf/openrocket/optimization/general/multidim/SearchPattern.java diff --git a/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java b/core/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java similarity index 100% rename from src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java rename to core/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/OptimizableParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/OptimizableParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/OptimizableParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/OptimizableParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/OptimizationGoal.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/OptimizationGoal.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/OptimizationGoal.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/OptimizationGoal.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationListener.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationListener.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationListener.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationListener.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/SimulationDomain.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/SimulationModifier.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/SimulationModifier.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/SimulationModifier.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/SimulationModifier.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/domains/IdentitySimulationDomain.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/domains/IdentitySimulationDomain.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/domains/IdentitySimulationDomain.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/domains/IdentitySimulationDomain.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/domains/StabilityDomain.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/domains/StabilityDomain.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/domains/StabilityDomain.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/domains/StabilityDomain.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/goals/MaximizationGoal.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/goals/MaximizationGoal.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/goals/MaximizationGoal.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/goals/MaximizationGoal.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/goals/MinimizationGoal.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/goals/MinimizationGoal.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/goals/MinimizationGoal.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/goals/MinimizationGoal.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/goals/ValueSeekGoal.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/goals/ValueSeekGoal.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/goals/ValueSeekGoal.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/goals/ValueSeekGoal.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericComponentModifier.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericComponentModifier.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericComponentModifier.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericComponentModifier.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/DeploymentVelocityParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/DeploymentVelocityParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/DeploymentVelocityParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/DeploymentVelocityParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/GroundHitVelocityParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/GroundHitVelocityParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/GroundHitVelocityParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/GroundHitVelocityParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/LandingDistanceParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/LandingDistanceParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/LandingDistanceParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/LandingDistanceParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAccelerationParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAccelerationParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAccelerationParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAccelerationParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAltitudeParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAltitudeParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAltitudeParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumAltitudeParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumVelocityParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumVelocityParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumVelocityParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/MaximumVelocityParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/StabilityParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/StabilityParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/StabilityParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/StabilityParameter.java diff --git a/src/net/sf/openrocket/optimization/rocketoptimization/parameters/TotalFlightTimeParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/TotalFlightTimeParameter.java similarity index 100% rename from src/net/sf/openrocket/optimization/rocketoptimization/parameters/TotalFlightTimeParameter.java rename to core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/TotalFlightTimeParameter.java diff --git a/src/net/sf/openrocket/optimization/services/DefaultOptimizableParameterService.java b/core/src/net/sf/openrocket/optimization/services/DefaultOptimizableParameterService.java similarity index 100% rename from src/net/sf/openrocket/optimization/services/DefaultOptimizableParameterService.java rename to core/src/net/sf/openrocket/optimization/services/DefaultOptimizableParameterService.java diff --git a/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java b/core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java similarity index 100% rename from src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java rename to core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java diff --git a/src/net/sf/openrocket/optimization/services/OptimizableParameterService.java b/core/src/net/sf/openrocket/optimization/services/OptimizableParameterService.java similarity index 100% rename from src/net/sf/openrocket/optimization/services/OptimizableParameterService.java rename to core/src/net/sf/openrocket/optimization/services/OptimizableParameterService.java diff --git a/src/net/sf/openrocket/optimization/services/OptimizationServiceHelper.java b/core/src/net/sf/openrocket/optimization/services/OptimizationServiceHelper.java similarity index 100% rename from src/net/sf/openrocket/optimization/services/OptimizationServiceHelper.java rename to core/src/net/sf/openrocket/optimization/services/OptimizationServiceHelper.java diff --git a/src/net/sf/openrocket/optimization/services/SimulationModifierService.java b/core/src/net/sf/openrocket/optimization/services/SimulationModifierService.java similarity index 100% rename from src/net/sf/openrocket/optimization/services/SimulationModifierService.java rename to core/src/net/sf/openrocket/optimization/services/SimulationModifierService.java diff --git a/src/net/sf/openrocket/preset/ComponentPreset.java b/core/src/net/sf/openrocket/preset/ComponentPreset.java similarity index 100% rename from src/net/sf/openrocket/preset/ComponentPreset.java rename to core/src/net/sf/openrocket/preset/ComponentPreset.java diff --git a/src/net/sf/openrocket/rocketcomponent/BodyComponent.java b/core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/BodyComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/BodyTube.java b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/BodyTube.java rename to core/src/net/sf/openrocket/rocketcomponent/BodyTube.java diff --git a/src/net/sf/openrocket/rocketcomponent/Bulkhead.java b/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Bulkhead.java rename to core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java diff --git a/src/net/sf/openrocket/rocketcomponent/CenteringRing.java b/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/CenteringRing.java rename to core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java diff --git a/src/net/sf/openrocket/rocketcomponent/ClusterConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/ClusterConfiguration.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ClusterConfiguration.java rename to core/src/net/sf/openrocket/rocketcomponent/ClusterConfiguration.java diff --git a/src/net/sf/openrocket/rocketcomponent/Clusterable.java b/core/src/net/sf/openrocket/rocketcomponent/Clusterable.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Clusterable.java rename to core/src/net/sf/openrocket/rocketcomponent/Clusterable.java diff --git a/src/net/sf/openrocket/rocketcomponent/Coaxial.java b/core/src/net/sf/openrocket/rocketcomponent/Coaxial.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Coaxial.java rename to core/src/net/sf/openrocket/rocketcomponent/Coaxial.java diff --git a/src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java b/core/src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java rename to core/src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java diff --git a/src/net/sf/openrocket/rocketcomponent/ComponentChangeEvent.java b/core/src/net/sf/openrocket/rocketcomponent/ComponentChangeEvent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ComponentChangeEvent.java rename to core/src/net/sf/openrocket/rocketcomponent/ComponentChangeEvent.java diff --git a/src/net/sf/openrocket/rocketcomponent/ComponentChangeListener.java b/core/src/net/sf/openrocket/rocketcomponent/ComponentChangeListener.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ComponentChangeListener.java rename to core/src/net/sf/openrocket/rocketcomponent/ComponentChangeListener.java diff --git a/src/net/sf/openrocket/rocketcomponent/Configuration.java b/core/src/net/sf/openrocket/rocketcomponent/Configuration.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Configuration.java rename to core/src/net/sf/openrocket/rocketcomponent/Configuration.java diff --git a/src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java rename to core/src/net/sf/openrocket/rocketcomponent/EllipticalFinSet.java diff --git a/src/net/sf/openrocket/rocketcomponent/EngineBlock.java b/core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/EngineBlock.java rename to core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java diff --git a/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ExternalComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/FinSet.java b/core/src/net/sf/openrocket/rocketcomponent/FinSet.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/FinSet.java rename to core/src/net/sf/openrocket/rocketcomponent/FinSet.java diff --git a/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java rename to core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java diff --git a/src/net/sf/openrocket/rocketcomponent/IllegalFinPointException.java b/core/src/net/sf/openrocket/rocketcomponent/IllegalFinPointException.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/IllegalFinPointException.java rename to core/src/net/sf/openrocket/rocketcomponent/IllegalFinPointException.java diff --git a/src/net/sf/openrocket/rocketcomponent/InnerTube.java b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/InnerTube.java rename to core/src/net/sf/openrocket/rocketcomponent/InnerTube.java diff --git a/src/net/sf/openrocket/rocketcomponent/InternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/InternalComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/InternalComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/InternalComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/LaunchLug.java b/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/LaunchLug.java rename to core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java diff --git a/src/net/sf/openrocket/rocketcomponent/MassComponent.java b/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/MassComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/MassComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/MassObject.java b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/MassObject.java rename to core/src/net/sf/openrocket/rocketcomponent/MassObject.java diff --git a/src/net/sf/openrocket/rocketcomponent/MotorMount.java b/core/src/net/sf/openrocket/rocketcomponent/MotorMount.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/MotorMount.java rename to core/src/net/sf/openrocket/rocketcomponent/MotorMount.java diff --git a/src/net/sf/openrocket/rocketcomponent/NoseCone.java b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/NoseCone.java rename to core/src/net/sf/openrocket/rocketcomponent/NoseCone.java diff --git a/src/net/sf/openrocket/rocketcomponent/Parachute.java b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Parachute.java rename to core/src/net/sf/openrocket/rocketcomponent/Parachute.java diff --git a/src/net/sf/openrocket/rocketcomponent/RadialParent.java b/core/src/net/sf/openrocket/rocketcomponent/RadialParent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/RadialParent.java rename to core/src/net/sf/openrocket/rocketcomponent/RadialParent.java diff --git a/src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java b/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java rename to core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java diff --git a/src/net/sf/openrocket/rocketcomponent/ReferenceType.java b/core/src/net/sf/openrocket/rocketcomponent/ReferenceType.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ReferenceType.java rename to core/src/net/sf/openrocket/rocketcomponent/ReferenceType.java diff --git a/src/net/sf/openrocket/rocketcomponent/RingComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RingComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/RingComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/RingComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Rocket.java rename to core/src/net/sf/openrocket/rocketcomponent/Rocket.java diff --git a/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/RocketComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/RocketUtils.java b/core/src/net/sf/openrocket/rocketcomponent/RocketUtils.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/RocketUtils.java rename to core/src/net/sf/openrocket/rocketcomponent/RocketUtils.java diff --git a/src/net/sf/openrocket/rocketcomponent/ShockCord.java b/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ShockCord.java rename to core/src/net/sf/openrocket/rocketcomponent/ShockCord.java diff --git a/src/net/sf/openrocket/rocketcomponent/Sleeve.java b/core/src/net/sf/openrocket/rocketcomponent/Sleeve.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Sleeve.java rename to core/src/net/sf/openrocket/rocketcomponent/Sleeve.java diff --git a/src/net/sf/openrocket/rocketcomponent/Stage.java b/core/src/net/sf/openrocket/rocketcomponent/Stage.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Stage.java rename to core/src/net/sf/openrocket/rocketcomponent/Stage.java diff --git a/src/net/sf/openrocket/rocketcomponent/Streamer.java b/core/src/net/sf/openrocket/rocketcomponent/Streamer.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Streamer.java rename to core/src/net/sf/openrocket/rocketcomponent/Streamer.java diff --git a/src/net/sf/openrocket/rocketcomponent/StructuralComponent.java b/core/src/net/sf/openrocket/rocketcomponent/StructuralComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/StructuralComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/StructuralComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java b/core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java rename to core/src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java diff --git a/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Transition.java rename to core/src/net/sf/openrocket/rocketcomponent/Transition.java diff --git a/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java rename to core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java diff --git a/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java b/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/TubeCoupler.java rename to core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java diff --git a/src/net/sf/openrocket/rocketcomponent/Visitable.java b/core/src/net/sf/openrocket/rocketcomponent/Visitable.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Visitable.java rename to core/src/net/sf/openrocket/rocketcomponent/Visitable.java diff --git a/src/net/sf/openrocket/rocketcomponent/Visitor.java b/core/src/net/sf/openrocket/rocketcomponent/Visitor.java similarity index 100% rename from src/net/sf/openrocket/rocketcomponent/Visitor.java rename to core/src/net/sf/openrocket/rocketcomponent/Visitor.java diff --git a/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java b/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java similarity index 100% rename from src/net/sf/openrocket/simulation/AbstractSimulationStepper.java rename to core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java diff --git a/src/net/sf/openrocket/simulation/AccelerationData.java b/core/src/net/sf/openrocket/simulation/AccelerationData.java similarity index 100% rename from src/net/sf/openrocket/simulation/AccelerationData.java rename to core/src/net/sf/openrocket/simulation/AccelerationData.java diff --git a/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java similarity index 100% rename from src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java rename to core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java diff --git a/src/net/sf/openrocket/simulation/BasicLandingStepper.java b/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java similarity index 100% rename from src/net/sf/openrocket/simulation/BasicLandingStepper.java rename to core/src/net/sf/openrocket/simulation/BasicLandingStepper.java diff --git a/src/net/sf/openrocket/simulation/EventQueue.java b/core/src/net/sf/openrocket/simulation/EventQueue.java similarity index 100% rename from src/net/sf/openrocket/simulation/EventQueue.java rename to core/src/net/sf/openrocket/simulation/EventQueue.java diff --git a/src/net/sf/openrocket/simulation/FlightData.java b/core/src/net/sf/openrocket/simulation/FlightData.java similarity index 100% rename from src/net/sf/openrocket/simulation/FlightData.java rename to core/src/net/sf/openrocket/simulation/FlightData.java diff --git a/src/net/sf/openrocket/simulation/FlightDataBranch.java b/core/src/net/sf/openrocket/simulation/FlightDataBranch.java similarity index 100% rename from src/net/sf/openrocket/simulation/FlightDataBranch.java rename to core/src/net/sf/openrocket/simulation/FlightDataBranch.java diff --git a/src/net/sf/openrocket/simulation/FlightDataType.java b/core/src/net/sf/openrocket/simulation/FlightDataType.java similarity index 100% rename from src/net/sf/openrocket/simulation/FlightDataType.java rename to core/src/net/sf/openrocket/simulation/FlightDataType.java diff --git a/src/net/sf/openrocket/simulation/FlightEvent.java b/core/src/net/sf/openrocket/simulation/FlightEvent.java similarity index 100% rename from src/net/sf/openrocket/simulation/FlightEvent.java rename to core/src/net/sf/openrocket/simulation/FlightEvent.java diff --git a/src/net/sf/openrocket/simulation/MassData.java b/core/src/net/sf/openrocket/simulation/MassData.java similarity index 100% rename from src/net/sf/openrocket/simulation/MassData.java rename to core/src/net/sf/openrocket/simulation/MassData.java diff --git a/src/net/sf/openrocket/simulation/RK4SimulationStatus.java b/core/src/net/sf/openrocket/simulation/RK4SimulationStatus.java similarity index 100% rename from src/net/sf/openrocket/simulation/RK4SimulationStatus.java rename to core/src/net/sf/openrocket/simulation/RK4SimulationStatus.java diff --git a/src/net/sf/openrocket/simulation/RK4SimulationStepper.java b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java similarity index 100% rename from src/net/sf/openrocket/simulation/RK4SimulationStepper.java rename to core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java diff --git a/src/net/sf/openrocket/simulation/SimulationConditions.java b/core/src/net/sf/openrocket/simulation/SimulationConditions.java similarity index 100% rename from src/net/sf/openrocket/simulation/SimulationConditions.java rename to core/src/net/sf/openrocket/simulation/SimulationConditions.java diff --git a/src/net/sf/openrocket/simulation/SimulationEngine.java b/core/src/net/sf/openrocket/simulation/SimulationEngine.java similarity index 100% rename from src/net/sf/openrocket/simulation/SimulationEngine.java rename to core/src/net/sf/openrocket/simulation/SimulationEngine.java diff --git a/src/net/sf/openrocket/simulation/SimulationOptions.java b/core/src/net/sf/openrocket/simulation/SimulationOptions.java similarity index 100% rename from src/net/sf/openrocket/simulation/SimulationOptions.java rename to core/src/net/sf/openrocket/simulation/SimulationOptions.java diff --git a/src/net/sf/openrocket/simulation/SimulationStatus.java b/core/src/net/sf/openrocket/simulation/SimulationStatus.java similarity index 100% rename from src/net/sf/openrocket/simulation/SimulationStatus.java rename to core/src/net/sf/openrocket/simulation/SimulationStatus.java diff --git a/src/net/sf/openrocket/simulation/SimulationStepper.java b/core/src/net/sf/openrocket/simulation/SimulationStepper.java similarity index 100% rename from src/net/sf/openrocket/simulation/SimulationStepper.java rename to core/src/net/sf/openrocket/simulation/SimulationStepper.java diff --git a/src/net/sf/openrocket/simulation/exception/MotorIgnitionException.java b/core/src/net/sf/openrocket/simulation/exception/MotorIgnitionException.java similarity index 100% rename from src/net/sf/openrocket/simulation/exception/MotorIgnitionException.java rename to core/src/net/sf/openrocket/simulation/exception/MotorIgnitionException.java diff --git a/src/net/sf/openrocket/simulation/exception/SimulationCalculationException.java b/core/src/net/sf/openrocket/simulation/exception/SimulationCalculationException.java similarity index 100% rename from src/net/sf/openrocket/simulation/exception/SimulationCalculationException.java rename to core/src/net/sf/openrocket/simulation/exception/SimulationCalculationException.java diff --git a/src/net/sf/openrocket/simulation/exception/SimulationCancelledException.java b/core/src/net/sf/openrocket/simulation/exception/SimulationCancelledException.java similarity index 100% rename from src/net/sf/openrocket/simulation/exception/SimulationCancelledException.java rename to core/src/net/sf/openrocket/simulation/exception/SimulationCancelledException.java diff --git a/src/net/sf/openrocket/simulation/exception/SimulationException.java b/core/src/net/sf/openrocket/simulation/exception/SimulationException.java similarity index 100% rename from src/net/sf/openrocket/simulation/exception/SimulationException.java rename to core/src/net/sf/openrocket/simulation/exception/SimulationException.java diff --git a/src/net/sf/openrocket/simulation/exception/SimulationLaunchException.java b/core/src/net/sf/openrocket/simulation/exception/SimulationLaunchException.java similarity index 100% rename from src/net/sf/openrocket/simulation/exception/SimulationLaunchException.java rename to core/src/net/sf/openrocket/simulation/exception/SimulationLaunchException.java diff --git a/src/net/sf/openrocket/simulation/exception/SimulationListenerException.java b/core/src/net/sf/openrocket/simulation/exception/SimulationListenerException.java similarity index 100% rename from src/net/sf/openrocket/simulation/exception/SimulationListenerException.java rename to core/src/net/sf/openrocket/simulation/exception/SimulationListenerException.java diff --git a/src/net/sf/openrocket/simulation/exception/SimulationNotSupportedException.java b/core/src/net/sf/openrocket/simulation/exception/SimulationNotSupportedException.java similarity index 100% rename from src/net/sf/openrocket/simulation/exception/SimulationNotSupportedException.java rename to core/src/net/sf/openrocket/simulation/exception/SimulationNotSupportedException.java diff --git a/src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java b/core/src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java rename to core/src/net/sf/openrocket/simulation/listeners/AbstractSimulationListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/SimulationComputationListener.java b/core/src/net/sf/openrocket/simulation/listeners/SimulationComputationListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/SimulationComputationListener.java rename to core/src/net/sf/openrocket/simulation/listeners/SimulationComputationListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/SimulationEventListener.java b/core/src/net/sf/openrocket/simulation/listeners/SimulationEventListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/SimulationEventListener.java rename to core/src/net/sf/openrocket/simulation/listeners/SimulationEventListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/SimulationListener.java b/core/src/net/sf/openrocket/simulation/listeners/SimulationListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/SimulationListener.java rename to core/src/net/sf/openrocket/simulation/listeners/SimulationListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java b/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java rename to core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java diff --git a/src/net/sf/openrocket/simulation/listeners/example/AirStart.java b/core/src/net/sf/openrocket/simulation/listeners/example/AirStart.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/example/AirStart.java rename to core/src/net/sf/openrocket/simulation/listeners/example/AirStart.java diff --git a/src/net/sf/openrocket/simulation/listeners/example/CSVSaveListener.java b/core/src/net/sf/openrocket/simulation/listeners/example/CSVSaveListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/example/CSVSaveListener.java rename to core/src/net/sf/openrocket/simulation/listeners/example/CSVSaveListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/example/PrintSimulationListener.java b/core/src/net/sf/openrocket/simulation/listeners/example/PrintSimulationListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/example/PrintSimulationListener.java rename to core/src/net/sf/openrocket/simulation/listeners/example/PrintSimulationListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/example/RollControlListener.java b/core/src/net/sf/openrocket/simulation/listeners/example/RollControlListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/example/RollControlListener.java rename to core/src/net/sf/openrocket/simulation/listeners/example/RollControlListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/example/StopSimulationListener.java b/core/src/net/sf/openrocket/simulation/listeners/example/StopSimulationListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/example/StopSimulationListener.java rename to core/src/net/sf/openrocket/simulation/listeners/example/StopSimulationListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/system/ApogeeEndListener.java b/core/src/net/sf/openrocket/simulation/listeners/system/ApogeeEndListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/system/ApogeeEndListener.java rename to core/src/net/sf/openrocket/simulation/listeners/system/ApogeeEndListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/system/InterruptListener.java b/core/src/net/sf/openrocket/simulation/listeners/system/InterruptListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/system/InterruptListener.java rename to core/src/net/sf/openrocket/simulation/listeners/system/InterruptListener.java diff --git a/src/net/sf/openrocket/simulation/listeners/system/RecoveryDeviceDeploymentEndListener.java b/core/src/net/sf/openrocket/simulation/listeners/system/RecoveryDeviceDeploymentEndListener.java similarity index 100% rename from src/net/sf/openrocket/simulation/listeners/system/RecoveryDeviceDeploymentEndListener.java rename to core/src/net/sf/openrocket/simulation/listeners/system/RecoveryDeviceDeploymentEndListener.java diff --git a/src/net/sf/openrocket/startup/Application.java b/core/src/net/sf/openrocket/startup/Application.java similarity index 100% rename from src/net/sf/openrocket/startup/Application.java rename to core/src/net/sf/openrocket/startup/Application.java diff --git a/src/net/sf/openrocket/startup/ExceptionHandler.java b/core/src/net/sf/openrocket/startup/ExceptionHandler.java similarity index 100% rename from src/net/sf/openrocket/startup/ExceptionHandler.java rename to core/src/net/sf/openrocket/startup/ExceptionHandler.java diff --git a/src/net/sf/openrocket/startup/Preferences.java b/core/src/net/sf/openrocket/startup/Preferences.java similarity index 100% rename from src/net/sf/openrocket/startup/Preferences.java rename to core/src/net/sf/openrocket/startup/Preferences.java diff --git a/src/net/sf/openrocket/startup/Startup.java b/core/src/net/sf/openrocket/startup/Startup.java similarity index 100% rename from src/net/sf/openrocket/startup/Startup.java rename to core/src/net/sf/openrocket/startup/Startup.java diff --git a/src/net/sf/openrocket/startup/Startup2.java b/core/src/net/sf/openrocket/startup/Startup2.java similarity index 100% rename from src/net/sf/openrocket/startup/Startup2.java rename to core/src/net/sf/openrocket/startup/Startup2.java diff --git a/src/net/sf/openrocket/startup/VersionHelper.java b/core/src/net/sf/openrocket/startup/VersionHelper.java similarity index 100% rename from src/net/sf/openrocket/startup/VersionHelper.java rename to core/src/net/sf/openrocket/startup/VersionHelper.java diff --git a/src/net/sf/openrocket/unit/CaliberUnit.java b/core/src/net/sf/openrocket/unit/CaliberUnit.java similarity index 100% rename from src/net/sf/openrocket/unit/CaliberUnit.java rename to core/src/net/sf/openrocket/unit/CaliberUnit.java diff --git a/src/net/sf/openrocket/unit/DegreeUnit.java b/core/src/net/sf/openrocket/unit/DegreeUnit.java similarity index 100% rename from src/net/sf/openrocket/unit/DegreeUnit.java rename to core/src/net/sf/openrocket/unit/DegreeUnit.java diff --git a/src/net/sf/openrocket/unit/FixedPrecisionUnit.java b/core/src/net/sf/openrocket/unit/FixedPrecisionUnit.java similarity index 100% rename from src/net/sf/openrocket/unit/FixedPrecisionUnit.java rename to core/src/net/sf/openrocket/unit/FixedPrecisionUnit.java diff --git a/src/net/sf/openrocket/unit/FrequencyUnit.java b/core/src/net/sf/openrocket/unit/FrequencyUnit.java similarity index 100% rename from src/net/sf/openrocket/unit/FrequencyUnit.java rename to core/src/net/sf/openrocket/unit/FrequencyUnit.java diff --git a/src/net/sf/openrocket/unit/GeneralUnit.java b/core/src/net/sf/openrocket/unit/GeneralUnit.java similarity index 100% rename from src/net/sf/openrocket/unit/GeneralUnit.java rename to core/src/net/sf/openrocket/unit/GeneralUnit.java diff --git a/src/net/sf/openrocket/unit/RadianUnit.java b/core/src/net/sf/openrocket/unit/RadianUnit.java similarity index 100% rename from src/net/sf/openrocket/unit/RadianUnit.java rename to core/src/net/sf/openrocket/unit/RadianUnit.java diff --git a/src/net/sf/openrocket/unit/TemperatureUnit.java b/core/src/net/sf/openrocket/unit/TemperatureUnit.java similarity index 100% rename from src/net/sf/openrocket/unit/TemperatureUnit.java rename to core/src/net/sf/openrocket/unit/TemperatureUnit.java diff --git a/src/net/sf/openrocket/unit/Tick.java b/core/src/net/sf/openrocket/unit/Tick.java similarity index 100% rename from src/net/sf/openrocket/unit/Tick.java rename to core/src/net/sf/openrocket/unit/Tick.java diff --git a/src/net/sf/openrocket/unit/Unit.java b/core/src/net/sf/openrocket/unit/Unit.java similarity index 100% rename from src/net/sf/openrocket/unit/Unit.java rename to core/src/net/sf/openrocket/unit/Unit.java diff --git a/src/net/sf/openrocket/unit/UnitGroup.java b/core/src/net/sf/openrocket/unit/UnitGroup.java similarity index 100% rename from src/net/sf/openrocket/unit/UnitGroup.java rename to core/src/net/sf/openrocket/unit/UnitGroup.java diff --git a/src/net/sf/openrocket/unit/Value.java b/core/src/net/sf/openrocket/unit/Value.java similarity index 100% rename from src/net/sf/openrocket/unit/Value.java rename to core/src/net/sf/openrocket/unit/Value.java diff --git a/src/net/sf/openrocket/unit/ValueComparator.java b/core/src/net/sf/openrocket/unit/ValueComparator.java similarity index 100% rename from src/net/sf/openrocket/unit/ValueComparator.java rename to core/src/net/sf/openrocket/unit/ValueComparator.java diff --git a/src/net/sf/openrocket/util/AbstractChangeSource.java b/core/src/net/sf/openrocket/util/AbstractChangeSource.java similarity index 100% rename from src/net/sf/openrocket/util/AbstractChangeSource.java rename to core/src/net/sf/openrocket/util/AbstractChangeSource.java diff --git a/src/net/sf/openrocket/util/ArrayList.java b/core/src/net/sf/openrocket/util/ArrayList.java similarity index 100% rename from src/net/sf/openrocket/util/ArrayList.java rename to core/src/net/sf/openrocket/util/ArrayList.java diff --git a/src/net/sf/openrocket/util/Base64.java b/core/src/net/sf/openrocket/util/Base64.java similarity index 100% rename from src/net/sf/openrocket/util/Base64.java rename to core/src/net/sf/openrocket/util/Base64.java diff --git a/src/net/sf/openrocket/util/BugException.java b/core/src/net/sf/openrocket/util/BugException.java similarity index 100% rename from src/net/sf/openrocket/util/BugException.java rename to core/src/net/sf/openrocket/util/BugException.java diff --git a/src/net/sf/openrocket/util/BuildProperties.java b/core/src/net/sf/openrocket/util/BuildProperties.java similarity index 100% rename from src/net/sf/openrocket/util/BuildProperties.java rename to core/src/net/sf/openrocket/util/BuildProperties.java diff --git a/src/net/sf/openrocket/util/ChangeSource.java b/core/src/net/sf/openrocket/util/ChangeSource.java similarity index 100% rename from src/net/sf/openrocket/util/ChangeSource.java rename to core/src/net/sf/openrocket/util/ChangeSource.java diff --git a/src/net/sf/openrocket/util/Chars.java b/core/src/net/sf/openrocket/util/Chars.java similarity index 100% rename from src/net/sf/openrocket/util/Chars.java rename to core/src/net/sf/openrocket/util/Chars.java diff --git a/src/net/sf/openrocket/util/Color.java b/core/src/net/sf/openrocket/util/Color.java similarity index 100% rename from src/net/sf/openrocket/util/Color.java rename to core/src/net/sf/openrocket/util/Color.java diff --git a/src/net/sf/openrocket/util/ComparablePair.java b/core/src/net/sf/openrocket/util/ComparablePair.java similarity index 100% rename from src/net/sf/openrocket/util/ComparablePair.java rename to core/src/net/sf/openrocket/util/ComparablePair.java diff --git a/src/net/sf/openrocket/util/ConcurrencyException.java b/core/src/net/sf/openrocket/util/ConcurrencyException.java similarity index 100% rename from src/net/sf/openrocket/util/ConcurrencyException.java rename to core/src/net/sf/openrocket/util/ConcurrencyException.java diff --git a/src/net/sf/openrocket/util/ConfigurationException.java b/core/src/net/sf/openrocket/util/ConfigurationException.java similarity index 100% rename from src/net/sf/openrocket/util/ConfigurationException.java rename to core/src/net/sf/openrocket/util/ConfigurationException.java diff --git a/src/net/sf/openrocket/util/Coordinate.java b/core/src/net/sf/openrocket/util/Coordinate.java similarity index 100% rename from src/net/sf/openrocket/util/Coordinate.java rename to core/src/net/sf/openrocket/util/Coordinate.java diff --git a/src/net/sf/openrocket/util/FatalException.java b/core/src/net/sf/openrocket/util/FatalException.java similarity index 100% rename from src/net/sf/openrocket/util/FatalException.java rename to core/src/net/sf/openrocket/util/FatalException.java diff --git a/src/net/sf/openrocket/util/GeodeticComputationStrategy.java b/core/src/net/sf/openrocket/util/GeodeticComputationStrategy.java similarity index 100% rename from src/net/sf/openrocket/util/GeodeticComputationStrategy.java rename to core/src/net/sf/openrocket/util/GeodeticComputationStrategy.java diff --git a/src/net/sf/openrocket/util/Inertia.java b/core/src/net/sf/openrocket/util/Inertia.java similarity index 100% rename from src/net/sf/openrocket/util/Inertia.java rename to core/src/net/sf/openrocket/util/Inertia.java diff --git a/src/net/sf/openrocket/util/Invalidatable.java b/core/src/net/sf/openrocket/util/Invalidatable.java similarity index 100% rename from src/net/sf/openrocket/util/Invalidatable.java rename to core/src/net/sf/openrocket/util/Invalidatable.java diff --git a/src/net/sf/openrocket/util/Invalidator.java b/core/src/net/sf/openrocket/util/Invalidator.java similarity index 100% rename from src/net/sf/openrocket/util/Invalidator.java rename to core/src/net/sf/openrocket/util/Invalidator.java diff --git a/src/net/sf/openrocket/util/JarUtil.java b/core/src/net/sf/openrocket/util/JarUtil.java similarity index 100% rename from src/net/sf/openrocket/util/JarUtil.java rename to core/src/net/sf/openrocket/util/JarUtil.java diff --git a/src/net/sf/openrocket/util/LimitedInputStream.java b/core/src/net/sf/openrocket/util/LimitedInputStream.java similarity index 100% rename from src/net/sf/openrocket/util/LimitedInputStream.java rename to core/src/net/sf/openrocket/util/LimitedInputStream.java diff --git a/src/net/sf/openrocket/util/LineStyle.java b/core/src/net/sf/openrocket/util/LineStyle.java similarity index 100% rename from src/net/sf/openrocket/util/LineStyle.java rename to core/src/net/sf/openrocket/util/LineStyle.java diff --git a/src/net/sf/openrocket/util/LinearInterpolator.java b/core/src/net/sf/openrocket/util/LinearInterpolator.java similarity index 100% rename from src/net/sf/openrocket/util/LinearInterpolator.java rename to core/src/net/sf/openrocket/util/LinearInterpolator.java diff --git a/src/net/sf/openrocket/util/ListenerList.java b/core/src/net/sf/openrocket/util/ListenerList.java similarity index 100% rename from src/net/sf/openrocket/util/ListenerList.java rename to core/src/net/sf/openrocket/util/ListenerList.java diff --git a/src/net/sf/openrocket/util/MathUtil.java b/core/src/net/sf/openrocket/util/MathUtil.java similarity index 100% rename from src/net/sf/openrocket/util/MathUtil.java rename to core/src/net/sf/openrocket/util/MathUtil.java diff --git a/src/net/sf/openrocket/util/MemoryManagement.java b/core/src/net/sf/openrocket/util/MemoryManagement.java similarity index 100% rename from src/net/sf/openrocket/util/MemoryManagement.java rename to core/src/net/sf/openrocket/util/MemoryManagement.java diff --git a/src/net/sf/openrocket/util/Monitorable.java b/core/src/net/sf/openrocket/util/Monitorable.java similarity index 100% rename from src/net/sf/openrocket/util/Monitorable.java rename to core/src/net/sf/openrocket/util/Monitorable.java diff --git a/src/net/sf/openrocket/util/MonitorableSet.java b/core/src/net/sf/openrocket/util/MonitorableSet.java similarity index 100% rename from src/net/sf/openrocket/util/MonitorableSet.java rename to core/src/net/sf/openrocket/util/MonitorableSet.java diff --git a/src/net/sf/openrocket/util/Mutable.java b/core/src/net/sf/openrocket/util/Mutable.java similarity index 100% rename from src/net/sf/openrocket/util/Mutable.java rename to core/src/net/sf/openrocket/util/Mutable.java diff --git a/src/net/sf/openrocket/util/Named.java b/core/src/net/sf/openrocket/util/Named.java similarity index 100% rename from src/net/sf/openrocket/util/Named.java rename to core/src/net/sf/openrocket/util/Named.java diff --git a/src/net/sf/openrocket/util/NumericComparator.java b/core/src/net/sf/openrocket/util/NumericComparator.java similarity index 100% rename from src/net/sf/openrocket/util/NumericComparator.java rename to core/src/net/sf/openrocket/util/NumericComparator.java diff --git a/src/net/sf/openrocket/util/Pair.java b/core/src/net/sf/openrocket/util/Pair.java similarity index 100% rename from src/net/sf/openrocket/util/Pair.java rename to core/src/net/sf/openrocket/util/Pair.java diff --git a/src/net/sf/openrocket/util/PinkNoise.java b/core/src/net/sf/openrocket/util/PinkNoise.java similarity index 100% rename from src/net/sf/openrocket/util/PinkNoise.java rename to core/src/net/sf/openrocket/util/PinkNoise.java diff --git a/src/net/sf/openrocket/util/PolyInterpolator.java b/core/src/net/sf/openrocket/util/PolyInterpolator.java similarity index 100% rename from src/net/sf/openrocket/util/PolyInterpolator.java rename to core/src/net/sf/openrocket/util/PolyInterpolator.java diff --git a/src/net/sf/openrocket/util/PrintProperties.java b/core/src/net/sf/openrocket/util/PrintProperties.java similarity index 100% rename from src/net/sf/openrocket/util/PrintProperties.java rename to core/src/net/sf/openrocket/util/PrintProperties.java diff --git a/src/net/sf/openrocket/util/Quaternion.java b/core/src/net/sf/openrocket/util/Quaternion.java similarity index 100% rename from src/net/sf/openrocket/util/Quaternion.java rename to core/src/net/sf/openrocket/util/Quaternion.java diff --git a/src/net/sf/openrocket/util/QuaternionMultiply.java b/core/src/net/sf/openrocket/util/QuaternionMultiply.java similarity index 100% rename from src/net/sf/openrocket/util/QuaternionMultiply.java rename to core/src/net/sf/openrocket/util/QuaternionMultiply.java diff --git a/src/net/sf/openrocket/util/Reflection.java b/core/src/net/sf/openrocket/util/Reflection.java similarity index 100% rename from src/net/sf/openrocket/util/Reflection.java rename to core/src/net/sf/openrocket/util/Reflection.java diff --git a/src/net/sf/openrocket/util/Rotation2D.java b/core/src/net/sf/openrocket/util/Rotation2D.java similarity index 100% rename from src/net/sf/openrocket/util/Rotation2D.java rename to core/src/net/sf/openrocket/util/Rotation2D.java diff --git a/src/net/sf/openrocket/util/SafetyMutex.java b/core/src/net/sf/openrocket/util/SafetyMutex.java similarity index 100% rename from src/net/sf/openrocket/util/SafetyMutex.java rename to core/src/net/sf/openrocket/util/SafetyMutex.java diff --git a/src/net/sf/openrocket/util/StateChangeListener.java b/core/src/net/sf/openrocket/util/StateChangeListener.java similarity index 100% rename from src/net/sf/openrocket/util/StateChangeListener.java rename to core/src/net/sf/openrocket/util/StateChangeListener.java diff --git a/src/net/sf/openrocket/util/Statistics.java b/core/src/net/sf/openrocket/util/Statistics.java similarity index 100% rename from src/net/sf/openrocket/util/Statistics.java rename to core/src/net/sf/openrocket/util/Statistics.java diff --git a/src/net/sf/openrocket/util/TestRockets.java b/core/src/net/sf/openrocket/util/TestRockets.java similarity index 100% rename from src/net/sf/openrocket/util/TestRockets.java rename to core/src/net/sf/openrocket/util/TestRockets.java diff --git a/src/net/sf/openrocket/util/TextUtil.java b/core/src/net/sf/openrocket/util/TextUtil.java similarity index 100% rename from src/net/sf/openrocket/util/TextUtil.java rename to core/src/net/sf/openrocket/util/TextUtil.java diff --git a/src/net/sf/openrocket/util/Transformation.java b/core/src/net/sf/openrocket/util/Transformation.java similarity index 100% rename from src/net/sf/openrocket/util/Transformation.java rename to core/src/net/sf/openrocket/util/Transformation.java diff --git a/src/net/sf/openrocket/util/UncloseableInputStream.java b/core/src/net/sf/openrocket/util/UncloseableInputStream.java similarity index 100% rename from src/net/sf/openrocket/util/UncloseableInputStream.java rename to core/src/net/sf/openrocket/util/UncloseableInputStream.java diff --git a/src/net/sf/openrocket/util/UniqueID.java b/core/src/net/sf/openrocket/util/UniqueID.java similarity index 100% rename from src/net/sf/openrocket/util/UniqueID.java rename to core/src/net/sf/openrocket/util/UniqueID.java diff --git a/src/net/sf/openrocket/util/Utils.java b/core/src/net/sf/openrocket/util/Utils.java similarity index 100% rename from src/net/sf/openrocket/util/Utils.java rename to core/src/net/sf/openrocket/util/Utils.java diff --git a/src/net/sf/openrocket/util/WorldCoordinate.java b/core/src/net/sf/openrocket/util/WorldCoordinate.java similarity index 100% rename from src/net/sf/openrocket/util/WorldCoordinate.java rename to core/src/net/sf/openrocket/util/WorldCoordinate.java diff --git a/src/net/sf/openrocket/utils/GraphicalMotorSelector.java b/core/src/net/sf/openrocket/utils/GraphicalMotorSelector.java similarity index 100% rename from src/net/sf/openrocket/utils/GraphicalMotorSelector.java rename to core/src/net/sf/openrocket/utils/GraphicalMotorSelector.java diff --git a/src/net/sf/openrocket/utils/LogSpeedTest.java b/core/src/net/sf/openrocket/utils/LogSpeedTest.java similarity index 100% rename from src/net/sf/openrocket/utils/LogSpeedTest.java rename to core/src/net/sf/openrocket/utils/LogSpeedTest.java diff --git a/src/net/sf/openrocket/utils/MotorCheck.java b/core/src/net/sf/openrocket/utils/MotorCheck.java similarity index 100% rename from src/net/sf/openrocket/utils/MotorCheck.java rename to core/src/net/sf/openrocket/utils/MotorCheck.java diff --git a/src/net/sf/openrocket/utils/MotorCompare.java b/core/src/net/sf/openrocket/utils/MotorCompare.java similarity index 100% rename from src/net/sf/openrocket/utils/MotorCompare.java rename to core/src/net/sf/openrocket/utils/MotorCompare.java diff --git a/src/net/sf/openrocket/utils/MotorCompareAll.java b/core/src/net/sf/openrocket/utils/MotorCompareAll.java similarity index 100% rename from src/net/sf/openrocket/utils/MotorCompareAll.java rename to core/src/net/sf/openrocket/utils/MotorCompareAll.java diff --git a/src/net/sf/openrocket/utils/MotorCorrelation.java b/core/src/net/sf/openrocket/utils/MotorCorrelation.java similarity index 100% rename from src/net/sf/openrocket/utils/MotorCorrelation.java rename to core/src/net/sf/openrocket/utils/MotorCorrelation.java diff --git a/src/net/sf/openrocket/utils/MotorDigester.java b/core/src/net/sf/openrocket/utils/MotorDigester.java similarity index 100% rename from src/net/sf/openrocket/utils/MotorDigester.java rename to core/src/net/sf/openrocket/utils/MotorDigester.java diff --git a/src/net/sf/openrocket/utils/MotorPlot.java b/core/src/net/sf/openrocket/utils/MotorPlot.java similarity index 100% rename from src/net/sf/openrocket/utils/MotorPlot.java rename to core/src/net/sf/openrocket/utils/MotorPlot.java diff --git a/src/net/sf/openrocket/utils/MotorPrinter.java b/core/src/net/sf/openrocket/utils/MotorPrinter.java similarity index 100% rename from src/net/sf/openrocket/utils/MotorPrinter.java rename to core/src/net/sf/openrocket/utils/MotorPrinter.java diff --git a/src/net/sf/openrocket/utils/RocksimConverter.java b/core/src/net/sf/openrocket/utils/RocksimConverter.java similarity index 100% rename from src/net/sf/openrocket/utils/RocksimConverter.java rename to core/src/net/sf/openrocket/utils/RocksimConverter.java diff --git a/src/net/sf/openrocket/utils/TestFunctionOptimizer.java b/core/src/net/sf/openrocket/utils/TestFunctionOptimizer.java similarity index 100% rename from src/net/sf/openrocket/utils/TestFunctionOptimizer.java rename to core/src/net/sf/openrocket/utils/TestFunctionOptimizer.java diff --git a/src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java b/core/src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java similarity index 100% rename from src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java rename to core/src/net/sf/openrocket/utils/TestFunctionOptimizerLoop.java