diff --git a/.gitmodules b/.gitmodules
index 3edccafc3..71fb41c90 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "swing/resources-src/datafiles/components"]
-	path = swing/resources-src/datafiles/components
+	path = swing/resources-src/datafiles/components-dbcook
 	url = https://github.com/dbcook/openrocket-database.git
diff --git a/swing/build.xml b/swing/build.xml
index 578f0994c..91ce8c675 100644
--- a/swing/build.xml
+++ b/swing/build.xml
@@ -64,7 +64,7 @@
 	<target name="clean" description="Removes all build artifacts">
 		<delete dir="${build.dir}"/>
 		<delete dir="${tmp.dir}/"/>
-		<delete dir="${resources.dir}/datafiles/presets"/>
+		<delete dir="${resources.dir}/datafiles/components"/>
 	</target>
 		
 	
@@ -144,7 +144,7 @@
 				classpathref="run-classpath"
 				failonerror="true">
 				<arg value="@{dir}"/>
-				<arg value="${resources-src.dir}/datafiles/presets/@{vendor}.orc"/>
+				<arg value="${resources-src.dir}/datafiles/components-openrocket/@{vendor}.orc"/>
 			</java>
 		</sequential>
 	</macrodef>
@@ -169,7 +169,7 @@
 
 	<!-- COPY orc files from source directories to build directory	-->
 	<target name="check-database" description="check component database">
-		<available file="${resources-src.dir}/datafiles/components/orc" property="database"/>
+		<available file="${resources-src.dir}/datafiles/components-dbcook/orc" property="database"/>
 	</target>
 
 	<target name="copy-orc-files" depends="check-database"
@@ -188,8 +188,8 @@ ${line.separator}
 If you retrieved this code by downloading and uncompressing a zip file, ${line.separator}
 you must do the same for the submodule.  Download the code ${line.separator}
 from https://github.com/dbcook/openrocket-database and uncompress it.${line.separator}
-Copy the files and directories under the openrocket-database-master ${line.separator}
-into ${resources-src.dir}/datafiles/components/ ${line.separator}
+Copy the files and directories under openrocket-database-master ${line.separator}
+into ${resources-src.dir}/datafiles/components-dbcook/ ${line.separator}
 ${line.separator}
 After including the database submodule, you will be able to build
 ${line.separator}
@@ -201,15 +201,15 @@ the .jar file
 				</not>
 			</condition>
 	  	</fail>
-	  	<copy todir="${resources.dir}/datafiles/presets">
-			<fileset dir="${resources-src.dir}/datafiles/legacy_components"/>
+	  	<copy todir="${resources.dir}/datafiles/components">
+			<fileset dir="${resources-src.dir}/datafiles/components-openrocket"/>
 	  	</copy>
-	  	<copy todir="${resources.dir}/datafiles/presets">
-			<fileset dir="${resources-src.dir}/datafiles/components/orc"/>
+	  	<copy todir="${resources.dir}/datafiles/components">
+			<fileset dir="${resources-src.dir}/datafiles/components-dbcook/orc"/>
 	  	</copy>
 	  	<copy
-		    file="${resources-src.dir}/datafiles/components/LICENSE"
-		    todir="${resources.dir}/datafiles/presets">
+		    file="${resources-src.dir}/datafiles/components-dbcook/LICENSE"
+		    todir="${resources.dir}/datafiles/components">
 	  	</copy>
 	</target>
 
diff --git a/swing/resources-src/datafiles/components b/swing/resources-src/datafiles/components-dbcook
similarity index 100%
rename from swing/resources-src/datafiles/components
rename to swing/resources-src/datafiles/components-dbcook
diff --git a/swing/resources-src/datafiles/legacy_components/Estes-legacy.orc b/swing/resources-src/datafiles/components-openrocket/Estes-legacy.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/Estes-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/Estes-legacy.orc
diff --git a/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc b/swing/resources-src/datafiles/components-openrocket/Front_Range_Rocket_Recovery.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc
rename to swing/resources-src/datafiles/components-openrocket/Front_Range_Rocket_Recovery.orc
diff --git a/swing/resources-src/datafiles/legacy_components/Fruity_Chutes_Enhanced.orc b/swing/resources-src/datafiles/components-openrocket/Fruity_Chutes_Enhanced.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/Fruity_Chutes_Enhanced.orc
rename to swing/resources-src/datafiles/components-openrocket/Fruity_Chutes_Enhanced.orc
diff --git a/swing/resources-src/datafiles/legacy_components/LocPrecision-legacy.orc b/swing/resources-src/datafiles/components-openrocket/LocPrecision-legacy.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/LocPrecision-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/LocPrecision-legacy.orc
diff --git a/swing/resources-src/datafiles/legacy_components/Quest-legacy.orc b/swing/resources-src/datafiles/components-openrocket/Quest-legacy.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/Quest-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/Quest-legacy.orc
diff --git a/swing/resources-src/datafiles/legacy_components/RailButton_Database.orc b/swing/resources-src/datafiles/components-openrocket/RailButton_Database.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/RailButton_Database.orc
rename to swing/resources-src/datafiles/components-openrocket/RailButton_Database.orc
diff --git a/swing/resources-src/datafiles/legacy_components/Rocketman.orc b/swing/resources-src/datafiles/components-openrocket/Rocketman.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/Rocketman.orc
rename to swing/resources-src/datafiles/components-openrocket/Rocketman.orc
diff --git a/swing/resources-src/datafiles/legacy_components/Spherachutes_Parachutes.orc b/swing/resources-src/datafiles/components-openrocket/Spherachutes_Parachutes.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/Spherachutes_Parachutes.orc
rename to swing/resources-src/datafiles/components-openrocket/Spherachutes_Parachutes.orc
diff --git a/swing/resources-src/datafiles/legacy_components/b2_Rocketry_Parachutes..orc b/swing/resources-src/datafiles/components-openrocket/b2_Rocketry_Parachutes..orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/b2_Rocketry_Parachutes..orc
rename to swing/resources-src/datafiles/components-openrocket/b2_Rocketry_Parachutes..orc
diff --git a/swing/resources-src/datafiles/legacy_components/bluetube-legacy.orc b/swing/resources-src/datafiles/components-openrocket/bluetube-legacy.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/bluetube-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/bluetube-legacy.orc
diff --git a/swing/resources-src/datafiles/legacy_components/bms-legacy.orc b/swing/resources-src/datafiles/components-openrocket/bms-legacy.orc
similarity index 99%
rename from swing/resources-src/datafiles/legacy_components/bms-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/bms-legacy.orc
index 5c4335245..8b23edb6f 100644
--- a/swing/resources-src/datafiles/legacy_components/bms-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/bms-legacy.orc
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
-    <Version>0.1</Version>
+  <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/cm3">
             <Name>Balsa</Name>
diff --git a/swing/resources-src/datafiles/legacy_components/fliskits-legacy.orc b/swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc
similarity index 99%
rename from swing/resources-src/datafiles/legacy_components/fliskits-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc
index 3d85d4816..55ea9a827 100644
--- a/swing/resources-src/datafiles/legacy_components/fliskits-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/fliskits-legacy.orc
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
-    <Version>0.1</Version>
+  <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/cm3">
             <Name>Balsa</Name>
diff --git a/swing/resources-src/datafiles/legacy_components/giantleaprocketry-legacy.orc b/swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc
similarity index 99%
rename from swing/resources-src/datafiles/legacy_components/giantleaprocketry-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc
index 3fe782dd2..4b70f473d 100644
--- a/swing/resources-src/datafiles/legacy_components/giantleaprocketry-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/giantleaprocketry-legacy.orc
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
-    <Version>0.1</Version>
+  <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/cm3">
             <Name>Birch</Name>
diff --git a/swing/resources-src/datafiles/legacy_components/publicmissiles-legacy.orc b/swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc
similarity index 99%
rename from swing/resources-src/datafiles/legacy_components/publicmissiles-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc
index 2a9a79e8b..ff45db001 100644
--- a/swing/resources-src/datafiles/legacy_components/publicmissiles-legacy.orc
+++ b/swing/resources-src/datafiles/components-openrocket/publicmissiles-legacy.orc
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <OpenRocketComponent>
-    <Version>0.1</Version>
+  <Version>0.1</Version>
+  <Legacy />
     <Materials>
         <Material UnitsOfMeasure="g/m">
             <Name>1/16 In. braided nylon</Name>
diff --git a/swing/resources-src/datafiles/legacy_components/semroc-legacy.orc b/swing/resources-src/datafiles/components-openrocket/semroc-legacy.orc
similarity index 100%
rename from swing/resources-src/datafiles/legacy_components/semroc-legacy.orc
rename to swing/resources-src/datafiles/components-openrocket/semroc-legacy.orc
diff --git a/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java b/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
index f91706838..7ba2ee72f 100644
--- a/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
+++ b/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
@@ -28,7 +28,7 @@ public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
 	
 	private final static Logger log = LoggerFactory.getLogger(ComponentPresetDatabaseLoader.class);
 	
-	private static final String SYSTEM_PRESET_DIR = "datafiles/presets";
+	private static final String SYSTEM_PRESET_DIR = "datafiles/components";
 	private int fileCount = 0;
 	private int presetCount = 0;