diff --git a/core/build.gradle b/core/build.gradle
index d5e9a9501..1a02bbfde 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -134,7 +134,7 @@ tasks.register('copyReadmeMain', Copy) {
     }
 }
 
-def externalComponentsPath = './src/main/resources/datafiles/components'
+def externalComponentsPath = './src/main/resources/datafiles/components/database'
 def externalResourceComponents = './resources-src/datafiles/openrocket-database'
 
 // Initializes the submodules in Git.
diff --git a/core/src/main/resources/datafiles/components-openrocket/Estes-legacy.orc b/core/src/main/resources/datafiles/components/internal/Estes-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/Estes-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/Estes-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/Front_Range_Rocket_Recovery.orc b/core/src/main/resources/datafiles/components/internal/Front_Range_Rocket_Recovery.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/Front_Range_Rocket_Recovery.orc
rename to core/src/main/resources/datafiles/components/internal/Front_Range_Rocket_Recovery.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/Fruity_Chutes_Enhanced.orc b/core/src/main/resources/datafiles/components/internal/Fruity_Chutes_Enhanced.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/Fruity_Chutes_Enhanced.orc
rename to core/src/main/resources/datafiles/components/internal/Fruity_Chutes_Enhanced.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/LocPrecision-legacy.orc b/core/src/main/resources/datafiles/components/internal/LocPrecision-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/LocPrecision-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/LocPrecision-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/Quest-legacy.orc b/core/src/main/resources/datafiles/components/internal/Quest-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/Quest-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/Quest-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/RailButton_Database.orc b/core/src/main/resources/datafiles/components/internal/RailButton_Database.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/RailButton_Database.orc
rename to core/src/main/resources/datafiles/components/internal/RailButton_Database.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/Rocketman.orc b/core/src/main/resources/datafiles/components/internal/Rocketman.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/Rocketman.orc
rename to core/src/main/resources/datafiles/components/internal/Rocketman.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/Spherachutes_Parachutes.orc b/core/src/main/resources/datafiles/components/internal/Spherachutes_Parachutes.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/Spherachutes_Parachutes.orc
rename to core/src/main/resources/datafiles/components/internal/Spherachutes_Parachutes.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/b2_Rocketry_Parachutes..orc b/core/src/main/resources/datafiles/components/internal/b2_Rocketry_Parachutes..orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/b2_Rocketry_Parachutes..orc
rename to core/src/main/resources/datafiles/components/internal/b2_Rocketry_Parachutes..orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/bluetube-legacy.orc b/core/src/main/resources/datafiles/components/internal/bluetube-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/bluetube-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/bluetube-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/bms-legacy.orc b/core/src/main/resources/datafiles/components/internal/bms-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/bms-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/bms-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/fliskits-legacy.orc b/core/src/main/resources/datafiles/components/internal/fliskits-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/fliskits-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/fliskits-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/giantleaprocketry-legacy.orc b/core/src/main/resources/datafiles/components/internal/giantleaprocketry-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/giantleaprocketry-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/giantleaprocketry-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/publicmissiles-legacy.orc b/core/src/main/resources/datafiles/components/internal/publicmissiles-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/publicmissiles-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/publicmissiles-legacy.orc
diff --git a/core/src/main/resources/datafiles/components-openrocket/semroc-legacy.orc b/core/src/main/resources/datafiles/components/internal/semroc-legacy.orc
similarity index 100%
rename from core/src/main/resources/datafiles/components-openrocket/semroc-legacy.orc
rename to core/src/main/resources/datafiles/components/internal/semroc-legacy.orc