diff --git a/src/net/sf/openrocket/android/Application.java b/android/src/net/sf/openrocket/android/Application.java
similarity index 100%
rename from src/net/sf/openrocket/android/Application.java
rename to android/src/net/sf/openrocket/android/Application.java
diff --git a/src/net/sf/openrocket/android/LogHelper.java b/android/src/net/sf/openrocket/android/LogHelper.java
similarity index 100%
rename from src/net/sf/openrocket/android/LogHelper.java
rename to android/src/net/sf/openrocket/android/LogHelper.java
diff --git a/src/net/sf/openrocket/android/Main.java b/android/src/net/sf/openrocket/android/Main.java
similarity index 100%
rename from src/net/sf/openrocket/android/Main.java
rename to android/src/net/sf/openrocket/android/Main.java
diff --git a/src/net/sf/openrocket/android/PreferencesActivity.java b/android/src/net/sf/openrocket/android/PreferencesActivity.java
similarity index 100%
rename from src/net/sf/openrocket/android/PreferencesActivity.java
rename to android/src/net/sf/openrocket/android/PreferencesActivity.java
diff --git a/src/net/sf/openrocket/android/PreferencesAdapter.java b/android/src/net/sf/openrocket/android/PreferencesAdapter.java
similarity index 100%
rename from src/net/sf/openrocket/android/PreferencesAdapter.java
rename to android/src/net/sf/openrocket/android/PreferencesAdapter.java
diff --git a/src/net/sf/openrocket/android/db/DbAdapter.java b/android/src/net/sf/openrocket/android/db/DbAdapter.java
similarity index 100%
rename from src/net/sf/openrocket/android/db/DbAdapter.java
rename to android/src/net/sf/openrocket/android/db/DbAdapter.java
diff --git a/src/net/sf/openrocket/android/db/MotorDao.java b/android/src/net/sf/openrocket/android/db/MotorDao.java
similarity index 100%
rename from src/net/sf/openrocket/android/db/MotorDao.java
rename to android/src/net/sf/openrocket/android/db/MotorDao.java
diff --git a/src/net/sf/openrocket/android/motor/BurnPlotFragment.java b/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
similarity index 100%
rename from src/net/sf/openrocket/android/motor/BurnPlotFragment.java
rename to android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
diff --git a/src/net/sf/openrocket/android/motor/Motor.java b/android/src/net/sf/openrocket/android/motor/Motor.java
similarity index 100%
rename from src/net/sf/openrocket/android/motor/Motor.java
rename to android/src/net/sf/openrocket/android/motor/Motor.java
diff --git a/src/net/sf/openrocket/android/motor/MotorDetails.java b/android/src/net/sf/openrocket/android/motor/MotorDetails.java
similarity index 100%
rename from src/net/sf/openrocket/android/motor/MotorDetails.java
rename to android/src/net/sf/openrocket/android/motor/MotorDetails.java
diff --git a/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java b/android/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
similarity index 100%
rename from src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
rename to android/src/net/sf/openrocket/android/motor/MotorDetailsFragment.java
diff --git a/src/net/sf/openrocket/android/motor/MotorHierarchicalBrowser.java b/android/src/net/sf/openrocket/android/motor/MotorHierarchicalBrowser.java
similarity index 100%
rename from src/net/sf/openrocket/android/motor/MotorHierarchicalBrowser.java
rename to android/src/net/sf/openrocket/android/motor/MotorHierarchicalBrowser.java
diff --git a/src/net/sf/openrocket/android/motor/PersistentExpandableListActivity.java b/android/src/net/sf/openrocket/android/motor/PersistentExpandableListActivity.java
similarity index 100%
rename from src/net/sf/openrocket/android/motor/PersistentExpandableListActivity.java
rename to android/src/net/sf/openrocket/android/motor/PersistentExpandableListActivity.java
diff --git a/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
similarity index 100%
rename from src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
rename to android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderTask.java
diff --git a/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
similarity index 100%
rename from src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
rename to android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
diff --git a/src/net/sf/openrocket/android/simulation/GraphicalActivity.java b/android/src/net/sf/openrocket/android/simulation/GraphicalActivity.java
similarity index 100%
rename from src/net/sf/openrocket/android/simulation/GraphicalActivity.java
rename to android/src/net/sf/openrocket/android/simulation/GraphicalActivity.java
diff --git a/src/net/sf/openrocket/android/simulation/SimulationChart.java b/android/src/net/sf/openrocket/android/simulation/SimulationChart.java
similarity index 100%
rename from src/net/sf/openrocket/android/simulation/SimulationChart.java
rename to android/src/net/sf/openrocket/android/simulation/SimulationChart.java
diff --git a/src/net/sf/openrocket/android/simulation/SimulationViewer.java b/android/src/net/sf/openrocket/android/simulation/SimulationViewer.java
similarity index 100%
rename from src/net/sf/openrocket/android/simulation/SimulationViewer.java
rename to android/src/net/sf/openrocket/android/simulation/SimulationViewer.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/Base64Decoder.java b/android/src/net/sf/openrocket/android/thrustcurve/Base64Decoder.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/Base64Decoder.java
rename to android/src/net/sf/openrocket/android/thrustcurve/Base64Decoder.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/DownloadRequest.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadRequest.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/DownloadRequest.java
rename to android/src/net/sf/openrocket/android/thrustcurve/DownloadRequest.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
rename to android/src/net/sf/openrocket/android/thrustcurve/DownloadResponse.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java b/android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java
rename to android/src/net/sf/openrocket/android/thrustcurve/DownloadResponseParser.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/MotorBurnFile.java b/android/src/net/sf/openrocket/android/thrustcurve/MotorBurnFile.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/MotorBurnFile.java
rename to android/src/net/sf/openrocket/android/thrustcurve/MotorBurnFile.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/RSEBurnFile.java b/android/src/net/sf/openrocket/android/thrustcurve/RSEBurnFile.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/RSEBurnFile.java
rename to android/src/net/sf/openrocket/android/thrustcurve/RSEBurnFile.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/RaspBurnFile.java b/android/src/net/sf/openrocket/android/thrustcurve/RaspBurnFile.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/RaspBurnFile.java
rename to android/src/net/sf/openrocket/android/thrustcurve/RaspBurnFile.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/SearchRequest.java b/android/src/net/sf/openrocket/android/thrustcurve/SearchRequest.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/SearchRequest.java
rename to android/src/net/sf/openrocket/android/thrustcurve/SearchRequest.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/SearchResponse.java b/android/src/net/sf/openrocket/android/thrustcurve/SearchResponse.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/SearchResponse.java
rename to android/src/net/sf/openrocket/android/thrustcurve/SearchResponse.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/SearchResponseParser.java b/android/src/net/sf/openrocket/android/thrustcurve/SearchResponseParser.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/SearchResponseParser.java
rename to android/src/net/sf/openrocket/android/thrustcurve/SearchResponseParser.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/SupportedFileTypes.java b/android/src/net/sf/openrocket/android/thrustcurve/SupportedFileTypes.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/SupportedFileTypes.java
rename to android/src/net/sf/openrocket/android/thrustcurve/SupportedFileTypes.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/TCMotor.java b/android/src/net/sf/openrocket/android/thrustcurve/TCMotor.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/TCMotor.java
rename to android/src/net/sf/openrocket/android/thrustcurve/TCMotor.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
rename to android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
diff --git a/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java b/android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
similarity index 100%
rename from src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java
rename to android/src/net/sf/openrocket/android/thrustcurve/ThrustCurveAPI.java