diff --git a/core/build.xml b/core/build.xml index 66da60330..ee1ee9c5d 100644 --- a/core/build.xml +++ b/core/build.xml @@ -108,29 +108,22 @@ - + - + + + - - - - - - - - - @@ -177,7 +170,7 @@ - + diff --git a/core/resources-src/datafiles/thrustcurves/SF_A8.eng b/core/resources-src/datafiles/thrustcurves/manual/WECO_A8.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SF_A8.eng rename to core/resources-src/datafiles/thrustcurves/manual/WECO_A8.eng diff --git a/core/resources-src/datafiles/thrustcurves/SF_B4.eng b/core/resources-src/datafiles/thrustcurves/manual/WECO_B4.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SF_B4.eng rename to core/resources-src/datafiles/thrustcurves/manual/WECO_B4.eng diff --git a/core/resources-src/datafiles/thrustcurves/SF_C2.eng b/core/resources-src/datafiles/thrustcurves/manual/WECO_C2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SF_C2.eng rename to core/resources-src/datafiles/thrustcurves/manual/WECO_C2.eng diff --git a/core/resources-src/datafiles/thrustcurves/SF_C6.eng b/core/resources-src/datafiles/thrustcurves/manual/WECO_C6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SF_C6.eng rename to core/resources-src/datafiles/thrustcurves/manual/WECO_C6.eng diff --git a/core/resources-src/datafiles/thrustcurves/SF_D7.eng b/core/resources-src/datafiles/thrustcurves/manual/WECO_D7.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SF_D7.eng rename to core/resources-src/datafiles/thrustcurves/manual/WECO_D7.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I195.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I195.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I195.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I195.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I195.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I195.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I195.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I195.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I220.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I220.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I220.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I220.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I220.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I220.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I220.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I220.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I271.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I271.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I271.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I271.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I271.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I271.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I271.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I271.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I285.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I285.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I285.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I285.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I285.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I285.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I285.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I285.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I315.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I315.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I315.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I315.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I315.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I315.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I315.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I315.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I325.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I325.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I325.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I325.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I325.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I325.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I325.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I325.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I375.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I375.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I375.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I375.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_I375.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I375.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_I375.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_I375.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J230.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J230.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J230.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J230.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J230.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J230.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J230.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J230.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J357.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J357.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J357.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J357.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J357.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J357.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J357.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J357.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J365.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J365.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J365.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J365.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J365.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J365.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J365.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J365.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J370.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J370.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J370.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J370.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J370.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J370.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J370.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J370.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J400.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J400.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J440.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J440.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J440.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J440.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J440.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J440.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J440.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J440.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J450.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J450.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J450.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J450.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J450.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J450.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J450.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J450.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J450_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J450_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J450_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J450_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J480.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J480.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J480.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J480.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J480.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J480.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J480.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J480.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J500.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_J500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_J500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_J500.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K1000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K1000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1000.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K1000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K1000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1000.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K1075.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1075.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K1075.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1075.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K1075.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1075.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K1075.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K1075.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K365.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K365.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K365.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K365.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K365.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K365.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K365.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K365.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K450.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K450.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K450.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K450.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K450.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K450.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K450.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K450.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K470.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K470.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K470.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K470.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K470.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K470.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K470.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K470.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K475.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K475.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K475.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K475.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K475.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K475.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K475.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K475.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K500.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K500.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K530.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K530.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K530.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K530.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K530.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K530.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K530.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K530.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K555.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K555.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K555.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K555.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K555.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K555.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K555.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K555.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K560.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K560.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K560.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K560.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K560.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K560.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K560.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K560.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K570.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K570.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K570.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K570.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K570.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K570.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K570.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K570.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K600.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K600.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K600_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K600_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K600_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K600_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K605.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K605.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K605.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K605.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K605.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K605.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K605.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K605.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K650.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K650.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K650.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K650.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K650.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K650.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K650.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K650.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K670.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K670.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K670.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K670.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K670.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K670.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K670.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K670.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K670_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K670_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K670_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K670_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K700.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K700.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K800.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K800.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K950.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K950.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K950.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K950.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K950.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K950.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K950.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K950.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K950_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K950_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K950_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K950_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K975.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K975.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K975.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K975.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_K975.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K975.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_K975.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_K975.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1060.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1060.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1060.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1060.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1060.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1060.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1060.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1060.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1060_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1060_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1060_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1060_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1080.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1080.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1080.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1080.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1080.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1080.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1080.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1080.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1100.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1100.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1111.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1111.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1111.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1111.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1111.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1111.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1111.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1111.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1300.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1300.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1400.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L1400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L1400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L1400.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L666.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L666.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L666.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L666.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L666.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L666.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L666.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L666.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L700.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L700.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L777.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L777.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L777.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L777.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L777.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L777.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L777.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L777.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L777_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L777_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L777_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L777_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L900.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L900.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L900.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L900.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_L900.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L900.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_L900.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_L900.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1350.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1350.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1350.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1350.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1350.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1350.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1350.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1350.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1480.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1480.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1480.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1480.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1480.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1480.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1480.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1480.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1730.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1730.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1730.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1730.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1730.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1730.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1730.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1730.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1850.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1850.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1850.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1850.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1850.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1850.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1850.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1850.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1850_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1850_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1850_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1850_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1900.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1900.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1900.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1900.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M1900.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1900.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M1900.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M1900.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M2200.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M2200.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M2200.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M2200.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M2500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M2500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M2500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M2500.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M2500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M2500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M2500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M2500.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M3000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M3000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M3000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M3000.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_M3000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M3000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_M3000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_M3000.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2020.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2020.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2020.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2020.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2020.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2020.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2020.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2020.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2600.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2600.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2700.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2700.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2800.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N2800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N2800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N2800.rse diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N4000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N4000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N4000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N4000.eng diff --git a/core/resources-src/datafiles/thrustcurves/AMW_N4000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N4000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AMW_N4000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AMW_N4000.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D10.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D10.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D10.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D10.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D13.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D13.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D13.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D13.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D13.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D13.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D13.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D13.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D15.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D15.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D15.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D15.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D15.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D15.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D15.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D15.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D21.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D21.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D21.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D21.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D21.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D21.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D21.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D21.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D24.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D24.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D24.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D24.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D24.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D24.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D24.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D24.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D7.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D7.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D7.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D7.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D7.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D7.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D7.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D7.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D9.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D9.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D9.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D9.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_D9.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D9.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_D9.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_D9.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E11.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E11.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E11.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E11.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E11.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E11.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E11.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E11.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E12.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E12.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E12.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E12.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E12.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E12.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E12.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E12.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E15.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E15.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E15.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E15.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E15.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E15.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E15.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E15.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E15_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E15_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E15_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E15_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E16.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E16.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E16.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E16.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E16.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E16.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E16.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E16.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E18.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E18.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E18.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E18.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E18.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E18.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E18.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E18.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E20.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E20.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E20.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E20.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E23.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E23.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E23.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E23.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E23.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E23.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E23.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E23.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E28.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E28.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E28.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E28.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E28.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E28.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E28.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E28.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E30.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E30.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E30.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E30.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E30.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E30.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E30.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E30.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E6.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E6.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E7.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E7.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E7.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E7.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_E7.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E7.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_E7.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_E7.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F10.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F10.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F10.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F10.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F12.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F12.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F12.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F12.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F12.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F12.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F12.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F12.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F13.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F13.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F13.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F13.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F13.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F13.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F13.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F13.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F16.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F16.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F16.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F16.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F16.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F16.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F16.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F16.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F20.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F20.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F20.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F20.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F20.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F20.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F20.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F20.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F21.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F21.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F21.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F21.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F21.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F21.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F21.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F21.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F22.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F22.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F22.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F22.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F22.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F22.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F22.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F22.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F23.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F23.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F23.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F23.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F23_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F23_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F23_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F23_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F23_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F24.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F24.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F24.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F24.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F24.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F24.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F24.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F24.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F25.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F25.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F25.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F25.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F25.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F25.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F25.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F25.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F26.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F26.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F26.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F26.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F26.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F26.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F26.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F26.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F27.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F27.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F27.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F27.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F30.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F30.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F30.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F30.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F32.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F32.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F32.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F32.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F32_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F32_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F32_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F32_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F32_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F35.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F35.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F35.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F35.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F37.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F37.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F37.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F37.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F37.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F37.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F37.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F37.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F39.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F39.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F39.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F39.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F39.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F39.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F39.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F39.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F40.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F40.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F40.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F40.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F40.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F40.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F40.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F40.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F42.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F42.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F42.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F42.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F42.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F42.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F42.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F42.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F50.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F50.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F50.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F50.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F50.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F50.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F50.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F50.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F52.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F52.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F52.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F52.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F52.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F52.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F52.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F52.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F62.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F62.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F62.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F62.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F62.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F62.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F62.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F62.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F72.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F72.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F72.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F72.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_F72.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F72.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_F72.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_F72.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G101.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G101.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G101.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G101.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G104.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G104.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G104.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G104.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G104.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G104.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G104.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G104.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G12.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G12.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G12.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G12.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G12.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G12.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G12.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G12.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G138.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G138.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G138.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G138.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G142.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G142.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G142.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G142.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G25.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G25.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G25.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G25.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G25.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G33.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G33.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G33.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G33.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G33.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G33.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G33.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G33.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G339.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G339.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G339.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G339.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G339.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G339.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G339.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G339.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G35.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G35.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G35.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G35.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G35.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G35.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G35.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G35.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G38.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G38.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G38.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G38.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G38.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G38.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G38.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G38.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G40.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G40.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G40.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G40.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G40.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G40.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G40.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G40.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G53.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G53.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G53.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G53.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G53.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G53.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G53.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G53.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G54.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G54.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G54.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G54.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G54.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G54.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G54.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G54.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G55.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G55.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G55.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G55.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G55.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G55.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G55.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G55.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G61.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G61.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G61.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G61.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G61.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G61.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G61.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G61.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G64.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G64.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G64.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G64.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G64.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G64.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G64.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G64.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G67.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G67.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G67.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G67.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G67.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G67.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G67.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G67.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G69.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G69.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G69.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G69.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G69.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G69.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G69.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G69.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G71.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G71.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G71.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G71.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G71.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G71.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G71.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G71.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G71_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G71_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G71_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G71_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G75.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G75.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G75.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G75.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G75_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G75_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G75_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G75_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G75_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G76.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G76.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G76.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G76.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G76.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G76.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G76.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G76.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G76_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G76_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G76_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G76_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G77.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G77.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G77.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G77.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G77.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G77.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G77.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G77.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G77_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G77_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G77_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G77_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G78.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G78.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G78.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G78.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G78_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G78_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G78_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G78_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G79.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G79.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G79.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G79.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G79.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G79.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G79.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G79.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G79_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G79_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G79_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G79_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G80.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G80.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G80.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G80_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G80_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_G80_2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_G80_2.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_G80_2.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H112.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H112.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H112.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H112.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H112.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H112.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H112.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H112.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H123.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H123.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H123.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H123.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H123.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H123.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H123.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H123.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H125.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H125.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H125.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H125.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H125.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H125.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H125.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H125.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H128.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H128.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H128.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H128.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H128.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H128.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H128.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H128.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H148.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H148.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H148.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H148.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H148.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H148.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H148.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H148.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H165.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H165.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H165.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H165.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H165.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H165.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H165.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H165.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H170.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H170.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H170.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H170.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H178.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H178.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H178.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H178.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H180.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H180.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H180.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H180.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H180.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H180.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H180.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H180.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H210.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H210.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H210.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H210.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H210.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H210.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H210.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H210.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H220.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H220.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H220.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H220.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H220.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H220.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H220.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H220.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H238.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H238.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H238.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H238.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H238.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H238.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H238.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H238.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H242.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H242.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H242.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H242.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H242.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H242.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H242.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H242.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H242_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H242_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H242_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H242_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H250.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H250.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H268.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H268.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H268.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H268.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H268.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H268.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H268.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H268.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H45.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H45.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H45.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H45.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H45.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H55.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H55.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H55.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H55.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H55.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H55.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H55.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H55.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H669.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H669.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H669.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H669.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H669.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H669.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H669.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H669.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H70.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H70.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H70.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H70.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H70.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H70.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H70.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H70.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H73.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H73.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H73.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H73.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H73.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H73.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H73.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H73.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H97.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H97.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H97.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H97.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H97.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H97.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H97.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H97.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H999.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H999.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H999.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H999.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_H999.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H999.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_H999.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_H999.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I115.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I115.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I115.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I115.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I117.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I117.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I117.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I117.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I1299.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I1299.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I1299.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I1299.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I1299.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I1299.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I1299.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I1299.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I132.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I132.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I132.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I132.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I132.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I132.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I132.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I132.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I154.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I154.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I154.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I154.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I154.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I154.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I154.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I154.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I161.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I161.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I161.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I161.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I161.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I161.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I161.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I161.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I170.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I170.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I170.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I170.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I195.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I195.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I195.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I195.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I195.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I195.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I195.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I195.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I195_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I195_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I195_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I195_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I200.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I200.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I200.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I200.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I200.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I200.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I200.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I200.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I211.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I211.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I211.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I211.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I211.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I211.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I211.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I211.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I215.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I215.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I215.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I215.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I218.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I218.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I218.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I218.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I218.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I218.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I218.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I218.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I225.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I225.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I225.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I225.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I225.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I225.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I225.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I225.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I229.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I229.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I229.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I229.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I245.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I245.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I245.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I245.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I245.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I245.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I245.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I245.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I284.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I284.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I284.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I284.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I284.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I284.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I284.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I284.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I284_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I284_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I284_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I284_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I285.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I285.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I285.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I285.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I285.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I285.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I285.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I285.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I300.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I300.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I305.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I305.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I305.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I305.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I305.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I305.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I305.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I305.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I327.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I327.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I327.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I327.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I350.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I350.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I350.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I350.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I357.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I357.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I357.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I357.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I357.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I357.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I357.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I357.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I364.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I364.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I364.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I364.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I364.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I364.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I364.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I364.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I366.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I366.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I366.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I366.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I366.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I366.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I366.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I366.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I435.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I435.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I435.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I435.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I435.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I435.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I435.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I435.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I435_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I435_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I435_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I435_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I49.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I49.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I49.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I49.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I49.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I49.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I49.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I49.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I59.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I59.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I59.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I59.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I59.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I59.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I59.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I59.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I599.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I599.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I599.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I599.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I600.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I600.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I65.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I65.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_I65.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_I65.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_I65.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J125.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J125.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J125.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J125.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J125.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J125.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J125.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J125.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J1299.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1299.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J1299.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1299.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J1299.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1299.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J1299.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1299.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J135.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J135.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J135.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J135.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J135.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J135.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J135.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J135.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J145.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J145.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J145.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J145.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J145.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J145.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J145.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J145.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J180.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J180.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J180.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J180.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J180.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J180.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J180.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J180.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J1999.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1999.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J1999.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1999.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J1999.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1999.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J1999.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J1999.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J210.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J210.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J210.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J210.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J210.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J210.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J210.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J210.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J250.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J260.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J260.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J260.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J260.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J260.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J260.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J260.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J260.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J275.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J275.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J275.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J275.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J275.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J275.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J275.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J275.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J315.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J315.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J315.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J315.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J315.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J315.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J315.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J315.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J340.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J340.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J340.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J340.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J350.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J350.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J350.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J350.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J350_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J350_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J350_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J350_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J350_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J390.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J390.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J390.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J390.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J390.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J390.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J390.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J390.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J401.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J401.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J401.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J401.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J415.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J415.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J415.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J415.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J415.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J415.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J415.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J415.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J420.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J420.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J420.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J420.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J420.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J420.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J420.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J420.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J460.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J460.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J460.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J460.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J460.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J460.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J460.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J460.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J500.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J500.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J510.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J510.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J510.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J510.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J540.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J540.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J540.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J540.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J540.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J540.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J540.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J540.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J570.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J570.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J570.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J570.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J570.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J570.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J570.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J570.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J575.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J575.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J575.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J575.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J575.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J575.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J575.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J575.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J800.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J800.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J825.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J825.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J825.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J825.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J825.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J825.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J825.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J825.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J90.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J90.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J90.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J90.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J90.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J90.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J90.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J90.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_J99.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J99.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_J99.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_J99.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1000.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1050.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1050.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1050.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1050.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1050.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1050.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1050.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1050.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1050_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1050_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1050_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1050_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1100.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1100.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1103.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1103.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1103.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1103.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1275.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1275.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1275.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1275.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1275.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1275.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1275.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1275.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1499.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1499.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1499.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1499.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1499.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1499.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1499.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1499.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K185.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K185.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K185.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K185.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K185.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K185.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K185.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K185.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1999.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1999.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1999.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1999.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K1999.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1999.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K1999.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K1999.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K250.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K250.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K270.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K270.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K270.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K270.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K270.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K270.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K270.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K270.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K375.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K375.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K375.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K375.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K375.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K375.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K375.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K375.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K456.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K456.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K456.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K456.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K458.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K458.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K458.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K458.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K458.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K458.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K458.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K458.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K480.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K480.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K480.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K480.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K485.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K485.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K485.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K485.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K485.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K485.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K485.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K485.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K513.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K513.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K513.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K513.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K540.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K540.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K540.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K540.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K550.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K550.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K550.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K550.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K550.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K550.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K550.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K550.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K560.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K560.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K560.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K560.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K560.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K560.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K560.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K560.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K650.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K650.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K650.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K650.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K650.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K650.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K650.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K650.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K680.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K680.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K680.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K680.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K680.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K680.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K680.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K680.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K695.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K695.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K695.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K695.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K695.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K695.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K695.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K695.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K700.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K700.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K780.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K780.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K780.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K780.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K780.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K780.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K780.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K780.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K805.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K805.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K805.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K805.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K805.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K805.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K805.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K805.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K828.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K828.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K828.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K828.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_K828.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K828.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_K828.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_K828.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1040.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1040.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1040.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1040.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1120.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1120.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1120.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1120.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1120.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1120.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1120.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1120.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1150.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1150.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1150.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1150.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1150.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1170.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1170.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1170.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1170.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1300.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1300.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1390.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1390.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1390.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1390.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1420.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1420.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1420.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1420.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1420.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1420.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1420.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1420.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1500.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1500.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L1520.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1520.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L1520.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L1520.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L2200.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L2200.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L2200.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L2200.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L339.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L339.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L339.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L339.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L339_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L339_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L339_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L339_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L400.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L850.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L850.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L850.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L850.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L850.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L850.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L850.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L850.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L900.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L900.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L900.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L900.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L952.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L952.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L952.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L952.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_L952.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L952.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_L952.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_L952.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1075.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1075.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1075.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1075.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1297.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1297.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1297.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1297.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1297.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1297.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1297.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1297.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1305.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1305.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1305.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1305.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1315.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1315.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1315.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1315.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1315.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1315.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1315.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1315.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1419.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1419.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1419.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1419.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1419.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1419.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1419.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1419.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1500.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1550.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1550.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1550.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1550.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1550.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1550.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1550.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1550.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1600.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1600.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1780.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1780.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1780_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1780_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1780_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1800.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1845.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1845.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1845.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1845.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1850.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1850.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1850.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1850.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1939.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1939.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1939.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1939.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M1939.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1939.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M1939.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M1939.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2000.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2000.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2030.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2030.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2030.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2030.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2100.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2400.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2400.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2500.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M2500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M2500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M2500.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M650.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M650.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M650.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M650.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M650.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M650.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M650.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M650.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M750.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M750.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M750.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M750.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M750.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M750.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M750.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M750.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M845.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M845.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M845.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M845.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_M845.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M845.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_M845.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_M845.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_N1000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N1000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_N1000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N1000.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_N2000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N2000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_N2000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N2000.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_N2000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N2000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_N2000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N2000.rse diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_N3300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N3300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_N3300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N3300.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_N4800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N4800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_N4800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N4800.eng diff --git a/core/resources-src/datafiles/thrustcurves/AeroTech_N4800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N4800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/AeroTech_N4800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/AeroTech_N4800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Alpha_I250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Alpha_I250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Alpha_I250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Alpha_I250.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_1_2A2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_2A2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_1_2A2.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_2A2.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_1_2A2.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_2A2.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_1_2A2.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_2A2.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_1_4A2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_4A2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_1_4A2.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_4A2.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_1_4A2.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_4A2.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_1_4A2.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_1_4A2.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_A2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_A2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_A2.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_A2.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_A2.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_A2.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_A2.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_A2.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_B2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_B2.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B2.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_B2.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B2.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_B2.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B2.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_B7.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B7.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_B7.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B7.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_B7.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B7.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_B7.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_B7.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_C10.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C10.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_C10.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C10.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_C10.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C10.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_C10.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C10.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_C4.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C4.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_C4.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C4.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_C4.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C4.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_C4.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C4.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_C6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_C6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_C6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_C6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_C6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_D10.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D10.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_D10.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D10.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_D10.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D10.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_D10.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D10.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_D3.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D3.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_D3.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D3.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_D3.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D3.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_D3.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_D3.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_E6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_E6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_E6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_E6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_E6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_E6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_E6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_E6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_F10.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_F10.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_F10.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_F10.eng diff --git a/core/resources-src/datafiles/thrustcurves/Apogee_F10.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_F10.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Apogee_F10.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Apogee_F10.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_E22.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E22.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_E22.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E22.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_E31.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E31.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_E31.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E31.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_E75.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E75.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_E75.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E75.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_E75.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E75.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_E75.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_E75.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F120.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F120.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F120.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F120.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F120.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F120.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F120.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F120.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F240.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F240.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F240.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F240.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F240.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F240.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F240.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F240.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F29.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F29.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F29.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F29.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F29.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F29.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F29.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F29.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F30.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F30.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F30.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F30.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F30.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F30.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F30.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F30.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F36.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F36.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F36.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F36.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F36_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F36_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F36_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F36_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F36_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F50.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F50.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F50.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F50.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F51.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F51.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F51.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F51.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F59.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F59.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F59.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F59.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F59.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F59.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F59.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F59.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F79.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F79.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F79.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F79.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F79.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F79.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F79.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F79.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F85.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F85.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F85.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F85.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_F85.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F85.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_F85.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_F85.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G106.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G106.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G106.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G106.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G106.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G106.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G106.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G106.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G107.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G107.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G107.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G107.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G107.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G107.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G107.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G107.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G115.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G115.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G115.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G115.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G117.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G117.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G117.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G117.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G117.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G117.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G117.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G117.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G118.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G118.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G118.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G118.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G118.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G118.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G118.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G118.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G125.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G125.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G125.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G125.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G125.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G125.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G125.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G125.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G126.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G126.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G126.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G126.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G126.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G126.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G126.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G126.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G127.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G127.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G127.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G127.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G127.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G127.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G127.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G127.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G131.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G131.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G131.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G131.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G131.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G131.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G131.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G131.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G150.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G150.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G150.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G150.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G150.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G185.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G185.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G185.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G185.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G250.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G250.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G46.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G46.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G46.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G46.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G50.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G50.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G50.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G50.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G50.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G50.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G50.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G50.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G54.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G54.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G54.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G54.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G54.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G54.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G54.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G54.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G57.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G57.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G57.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G57.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G57.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G57.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G57.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G57.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G58.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G58.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G58.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G58.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G58.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G58.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G58.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G58.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G60.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G60.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G60.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G60.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G60.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G60.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G60.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G60.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G65.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G65.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G65.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G65.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G65.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G65.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G65.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G65.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G68.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G68.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G68.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G68.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G68.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G68.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G68.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G68.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G69.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G69.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G69.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G69.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G69_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G69_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G69_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G69_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G69_2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69_2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G69_2.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G69_2.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G78.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G78.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G78.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G78.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G79.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G79.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G79.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G79.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G79.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G79.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G79.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G79.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G79_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G79_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G79_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G79_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G80.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G80.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G80.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G80.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G80.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G80.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G80.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G83.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G83.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G83.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G83.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G83.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G83.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G83.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G83.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G84.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G84.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G84.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G84.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G84.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G84.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G84.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G84.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G88.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G88.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G88.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G88.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_G88.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G88.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_G88.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_G88.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H110.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H110.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H110.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H110.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H110.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H110.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H110.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H110.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H118.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H118.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H118.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H118.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H118.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H118.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H118.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H118.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H120.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H120.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H120.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H120.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H120.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H120.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H120.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H120.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H123.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H123.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H123.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H123.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H123_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H123_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H123_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H123_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H123_2.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123_2.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H123_2.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H123_2.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H125.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H125.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H125.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H125.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H125.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H125.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H125.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H125.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H133.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H133.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H133.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H133.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H133.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H133.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H133.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H133.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H135.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H135.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H135.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H135.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H135.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H135.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H135.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H135.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H140.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H140.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H140.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H140.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H140.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H140.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H140.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H140.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H143.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H143.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H143.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H143.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H143.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H143.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H143.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H143.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H151.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H151.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H151.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H151.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H151.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H151.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H151.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H151.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H152.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H152.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H152.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H152.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H152.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H152.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H152.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H152.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H153.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H153.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H153.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H153.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H153.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H153.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H153.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H153.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H159.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H159.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H159.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H159.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H159.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H159.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H159.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H159.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H160.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H160.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H160.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H160.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H160.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H160.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H160.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H160.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H160_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H160_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H160_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H160_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H163.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H163.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H163.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H163.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H163.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H163.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H163.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H163.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H170.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H170.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H170.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H170.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H170.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H170.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H170.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H170.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H175.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H175.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H175.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H175.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H175.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H175.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H175.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H175.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H180.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H180.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H180.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H180.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H180.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H180.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H180.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H180.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H194.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H194.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H194.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H194.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H194.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H194.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H194.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H194.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H200.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H200.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H200.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H200.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H200.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H200.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H200.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H200.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H225.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H225.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H225.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H225.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H226.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H226.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H226.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H226.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H226.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H226.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H226.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H226.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H233.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H233.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H233.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H233.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H233.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H233.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H233.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H233.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H237.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H237.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H237.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H237.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H237.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H237.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H237.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H237.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H255.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H255.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H255.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H255.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H255_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H255_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H255_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H255_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H255_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H295.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H295.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H295.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H295.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H295.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H295.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H295.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H295.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H340.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H340.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H340.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H340.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H340.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H340.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H340.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H340.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H399.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H399.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H399.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H399.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H399.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H399.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H399.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H399.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H410.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H410.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H410.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H410.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H410.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H410.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H410.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H410.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H54.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H54.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H54.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H54.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H54.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H54.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H54.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H54.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H565.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H565.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H565.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H565.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H565.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H565.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H565.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H565.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H87.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H87.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H87.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H87.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H87.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H87.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H87.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H87.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H90.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H90.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H90.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H90.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_H90.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H90.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_H90.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_H90.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I120.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I120.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I120.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I120.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I120.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I120.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I120.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I120.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I140.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I140.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I140.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I140.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I140.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I140.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I140.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I140.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I150.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I150.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I150.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I150.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I150.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I165.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I165.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I165.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I165.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I170.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I170.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I170.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I170.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I170.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I170.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I170.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I170.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I175.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I175.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I175.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I175.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I175.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I175.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I175.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I175.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I180.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I180.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I180.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I180.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I180.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I180.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I180.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I180.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I195.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I195.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I195.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I195.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I204.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I204.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I204.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I204.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I204.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I204.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I204.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I204.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I205.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I205.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I205.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I205.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I205.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I205.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I205.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I205.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I212.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I212.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I212.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I212.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I212.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I212.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I212.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I212.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I216.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I216.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I216.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I216.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I216.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I216.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I216.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I216.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I218.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I218.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I218.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I218.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I218.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I218.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I218.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I218.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I223.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I223.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I223.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I223.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I223.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I223.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I223.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I223.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I224.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I224.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I224.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I224.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I224.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I224.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I224.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I224.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I236.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I236.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I236.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I236.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I236.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I236.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I236.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I236.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I240.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I240.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I240.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I240.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I240.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I240.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I240.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I240.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I242.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I242.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I242.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I242.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I242.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I242.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I242.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I242.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I243.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I243.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I243.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I243.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I243.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I243.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I243.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I243.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I255.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I255.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I255.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I255.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I285.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I285.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I285.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I285.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I285.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I285.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I285.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I285.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I287.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I287.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I287.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I287.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I287.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I287.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I287.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I287.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I297.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I297.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I297.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I297.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I297.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I297.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I297.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I297.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I303.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I303.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I303.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I303.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I303.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I303.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I303.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I303.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I345.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I345.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I345.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I345.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I350.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I350.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I350.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I350.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I350.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I350.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I350.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I350.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I360.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I360.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I360.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I360.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I360.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I360.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I360.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I360.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I445.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I445.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I445.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I445.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I445.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I445.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I445.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I445.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I470.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I470.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I470.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I470.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I540.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I540.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I540.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I540.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I540.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I540.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I540.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I540.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I566.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I566.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I566.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I566.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_I800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_I800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_I800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J1055.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J1055.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J1055.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J1055.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J1365.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J1365.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J1365.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J1365.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J140.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J140.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J140.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J140.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J140.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J140.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J140.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J140.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J1520.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J1520.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J1520.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J1520.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J210.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J210.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J210.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J210.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J210.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J210.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J210.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J210.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J240.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J240.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J240.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J240.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J244.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J244.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J244.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J244.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J244.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J244.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J244.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J244.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J250.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J250.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J270.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J270.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J270.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J270.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J270.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J270.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J270.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J270.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J280.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J280.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J280.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J280.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J280.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J280.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J280.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J280.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J285.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J285.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J285.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J285.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J285.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J285.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J285.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J285.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J290.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J290.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J290.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J290.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J290.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J290.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J290.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J290.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J293.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J293.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J293.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J293.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J293.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J293.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J293.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J293.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J295.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J295.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J295.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J295.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J295.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J295.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J295.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J295.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J300.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J300.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J316.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J316.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J316.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J316.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J316.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J316.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J316.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J316.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J325.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J325.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J325.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J325.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J330.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J330.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J330.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J330.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J330.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J330.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J330.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J330.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J335.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J335.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J335.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J335.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J354.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J354.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J354.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J354.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J354.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J354.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J354.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J354.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J355.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J355.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J355.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J355.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J357.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J357.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J357.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J357.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J357.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J357.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J357.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J357.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J360.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J360.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J360.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J360.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J360_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J360_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J360_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J360_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J360_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J380.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J380.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J380.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J380.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J380.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J380.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J380.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J380.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J381.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J381.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J381.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J381.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J381.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J381.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J381.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J381.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J394.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J394.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J394.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J394.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J394.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J394.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J394.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J394.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J395.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J395.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J395.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J395.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J400.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J401.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J401.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J401.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J401.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J410.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J410.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J410.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J410.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J410.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J410.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J410.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J410.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J420.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J420.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J420.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J420.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J420.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J420.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J420.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J420.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J425.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J425.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J425.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J425.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J430.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J430.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J430.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J430.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J430.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J430.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J430.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J430.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J440.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J440.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J440.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J440.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J440.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J440.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J440.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J440.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J449.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J449.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J449.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J449.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J449.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J449.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J449.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J449.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J453.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J453.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J453.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J453.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J475.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J475.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J475.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J475.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J475.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J475.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J475.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J475.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J475_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J475_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J475_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J475_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J520.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J520.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J520.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J520.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J520.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J520.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J520.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J520.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J530.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J530.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J530.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J530.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J530.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J530.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J530.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J530.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J580.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J580.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J580.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J580.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J580.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J580.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J580.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J580.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J595.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J595.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J595.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J595.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J595.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J595.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J595.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J595.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J600.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J600.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J745.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J745.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J745.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J745.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J760.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J760.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J760.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J760.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_J760.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J760.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_J760.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_J760.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1075.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1075.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1075.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1075.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1075.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1075.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1075.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1075.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1085.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1085.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1085.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1085.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1130.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1130.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1130.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1130.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1130.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1130.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1130.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1130.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1200.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1200.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1200.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1200.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1250.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1250.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1440.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1440.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1440.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1440.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K160.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K160.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K160.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K160.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K160.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K160.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K160.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K160.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1620.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1620.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1620.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1620.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K1720.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1720.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K1720.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K1720.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K2000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K2000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K2000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K2000.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K2045.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K2045.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K2045.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K2045.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K2045.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K2045.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K2045.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K2045.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K260.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K260.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K260.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K260.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K260.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K260.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K260.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K260.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K261.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K261.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K261.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K261.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K261.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K261.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K261.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K261.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K300.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K300.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K360.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K360.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K360.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K360.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K360.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K360.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K360.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K360.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K400.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K445.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K445.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K445.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K445.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K445.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K445.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K445.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K445.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K454.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K454.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K454.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K454.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K454.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K454.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K454.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K454.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K455.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K455.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K455.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K455.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K490.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K490.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K490.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K490.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K490.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K490.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K490.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K490.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K500.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K510.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K510.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K510.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K510.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K510.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K510.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K510.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K510.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K510_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K510_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K510_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K510_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K515.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K515.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K515.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K515.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K515.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K515.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K515.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K515.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K530.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K530.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K530.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K530.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K530.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K530.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K530.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K530.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K535.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K535.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K535.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K535.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K555.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K555.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K555.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K555.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K555.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K555.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K555.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K555.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K570.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K570.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K570.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K570.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K570.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K570.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K570.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K570.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K575.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K575.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K575.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K575.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K575.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K575.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K575.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K575.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K580.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K580.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K580.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K580.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K590.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K590.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K590.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K590.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K610.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K610.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K610.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K610.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K610.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K610.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K610.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K610.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K630.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K630.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K630.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K630.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K630.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K630.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K630.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K630.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K635.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K635.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K635.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K635.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K650.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K650.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K650.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K650.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K650_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K650_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K650_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K660.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K660.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K660.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K660.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K660.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K660.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K660.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K660.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K661.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K661.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K661.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K661.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K665.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K665.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K665.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K665.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K671.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K671.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K671.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K671.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K675.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K675.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K675.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K675.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K675.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K675.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K675.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K675.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K701.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K701.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K701.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K701.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K710.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K710.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K710.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K710.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K710.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K710.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K710.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K710.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K735.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K735.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K735.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K735.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K740.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K740.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K740.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K740.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K740.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K740.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K740.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K740.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K750.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K750.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K750.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K750.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K780.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K780.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K780.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K780.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K780.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K780.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K780.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K780.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K815.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K815.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K815.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K815.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K815.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K815.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K815.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K815.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K820.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K820.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K820.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K820.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K820.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K820.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K820.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K820.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K855.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K855.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K855.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K855.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K935.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K935.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K935.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K935.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K940.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K940.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K940.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K940.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_K940.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K940.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_K940.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_K940.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1030.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1030.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1030.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1030.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1050.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1050.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1050.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1050.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1090.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1090.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1090.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1090.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1090.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1090.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1090.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1090.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1115.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1115.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1115.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1115.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1115.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1115.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1115.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1115.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1115_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1115_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1115_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1115_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1276.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1276.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1276.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1276.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1276.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1276.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1276.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1276.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1290.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1290.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1290.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1290.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1290.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1290.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1290.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1290.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1350.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1350.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1350.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1350.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1355.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1355.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1355.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1355.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1355.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1355.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1355.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1355.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1395.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1395.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1395.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1395.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1395.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1395.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1395.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1395.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1410.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1410.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1410.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1410.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1410.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1410.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1410.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1410.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1685.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1685.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1685.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1685.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1685.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1685.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1685.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1685.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L1720.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1720.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L1720.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L1720.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L2375.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L2375.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L2375.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L2375.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L3150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L3150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L3150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L3150.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L3200.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L3200.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L3200.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L3200.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L585.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L585.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L585.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L585.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L585.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L585.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L585.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L585.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L610.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L610.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L610.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L610.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L610.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L610.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L610.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L610.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L640.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L640.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L640.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L640.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L640.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L640.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L640.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L640.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L645.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L645.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L645.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L645.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L730.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L730.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L730.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L730.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L730.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L730.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L730.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L730.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L800_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L800_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L800_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L800_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L805.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L805.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L805.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L805.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L820.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L820.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L820.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L820.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L820.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L820.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L820.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L820.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L851.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L851.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L851.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L851.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L851.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L851.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L851.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L851.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L890.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L890.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L890.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L890.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L890.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L890.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L890.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L890.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L910.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L910.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L910.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L910.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L935.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L935.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L935.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L935.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L935.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L935.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L935.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L935.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L985.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L985.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L985.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L985.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L990.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L990.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L990.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L990.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L990.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L990.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L990.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L990.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L995.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L995.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L995.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L995.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_L995.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L995.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_L995.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_L995.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1060.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1060.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1060.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1060.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1060.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1060.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1060.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1060.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1230.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1230.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1230.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1230.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1230.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1230.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1230.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1230.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1290.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1290.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1290.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1290.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1290.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1290.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1290.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1290.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1300.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1300.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1400.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1400_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1400_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1400_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1400_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1450.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1450.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1450.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1450.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1450.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1450.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1450.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1450.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1520.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1520.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1520.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1520.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1520.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1520.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1520.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1520.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1540.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1540.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1540.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1540.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1540.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1540.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1540.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1540.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1545.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1545.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1545.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1545.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1545.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1545.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1545.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1545.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1560.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1560.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1560.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1560.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1560.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1560.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1560.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1560.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1590.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1590.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1590.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1590.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1590.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1630.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1630.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1630.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1630.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1630.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1630.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1630.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1630.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1670.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1670.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1670.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1670.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1670.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1670.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1670.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1670.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1675.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1675.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1675.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1675.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1675.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1675.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1675.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1675.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1770.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1770.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1770.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1770.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1770_1.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1770_1.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1770_1.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1770_1.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1790.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1790.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1790.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1790.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1790.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1790.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1790.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1790.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1810.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1810.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1810.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1810.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1810.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1810.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1810.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1810.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M1890.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1890.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M1890.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M1890.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2020.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2020.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2020.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2020.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2020.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2020.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2020.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2020.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2045.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2045.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2045.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2045.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2045.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2045.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2045.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2045.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2050.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2050.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2050.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2050.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2050.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2050.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2050.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2050.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2075.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2075.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2075.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2075.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2075.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2075.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2075.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2075.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2080.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2080.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2080.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2080.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2080.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2080.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2080.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2080.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2150.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2150.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2150.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2150.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2150.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2245.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2245.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2245.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2245.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2245.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2245.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2245.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2245.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2250.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2250.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2505.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2505.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2505.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2505.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M2505.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2505.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M2505.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M2505.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M3100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M3100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M3100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M3100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M3400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M3400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3400.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M3400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M3400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M3700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M3700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3700.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M3700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M3700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M3700.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M4770.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M4770.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M4770.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M4770.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M520.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M520.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M520.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M520.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M520.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M520.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M520.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M520.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M795.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M795.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M795.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M795.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M795.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M795.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M795.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M795.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M840.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M840.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M840.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M840.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_M840.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M840.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_M840.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_M840.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N10000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N10000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N10000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N10000.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N10000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N10000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N10000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N10000.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N1100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N1100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N1100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N1100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N1800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N1800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N1800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N1800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N1975.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1975.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N1975.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1975.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N1975.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1975.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N1975.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N1975.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2500.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2500.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2501.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2501.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2501.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2501.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2501.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2501.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2501.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2501.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2540.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2540.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2540.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2540.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2600.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2600.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2850.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2850.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2850.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2850.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2850.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2850.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2850.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2850.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2900.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2900.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2900.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2900.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N2900_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2900_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N2900_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N2900_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N3180.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3180.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N3180.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3180.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N3301.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3301.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N3301.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3301.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N3301.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3301.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N3301.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3301.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N3400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N3400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3400.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N3400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N3400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N3800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N3800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N3800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N3800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N3800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N4100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N4100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N4100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N4100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N4100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N4100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N4100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N4100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N5800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N5800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_N5800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_N5800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_N5800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O25000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O25000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O25000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O25000.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O3700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O3700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O3700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O3700.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O3700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O3700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O3700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O3700.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O4900.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O4900.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O4900.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O4900.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O4900.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O4900.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O4900.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O4900.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O5100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O5100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O5100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O5100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O5800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O5800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O5800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O5800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O5800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O8000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O8000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O8000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O8000.eng diff --git a/core/resources-src/datafiles/thrustcurves/Cesaroni_O8000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O8000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Cesaroni_O8000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Cesaroni_O8000.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G123.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G123.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G123.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G123.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G123.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G123.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G123.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G123.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G130.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G130.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G130.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G130.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G130.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G130.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G130.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G130.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G234.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G234.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G234.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G234.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G234.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G234.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G234.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G234.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G300.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_G300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_G300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_G300.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H121.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H121.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H121.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H121.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H121.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H121.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H121.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H121.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H141.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H141.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H141.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H141.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H141.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H141.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H141.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H141.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H211.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H211.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H211.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H211.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H211.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H211.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H211.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H211.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H222.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H222.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H222.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H222.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H222.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H222.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H222.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H222.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H246.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H246.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H246.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H246.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H246.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H246.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H246.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H246.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H248.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H248.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H248.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H248.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H277.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H277.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H277.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H277.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H277.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H277.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H277.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H277.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H300.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H300.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H303.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H303.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H303.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H303.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H303.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H303.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H303.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H303.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H340.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H340.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H340.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H340.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_H340.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H340.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_H340.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_H340.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I155.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I155.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I155.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I155.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I155.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I155.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I155.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I155.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I210.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I210.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I210.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I210.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I210.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I210.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I210.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I210.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I221.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I221.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I221.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I221.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I221.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I221.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I221.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I221.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I250.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I290.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I290.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I290.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I290.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I290.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I290.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I290.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I290.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I307.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I307.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I307.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I307.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I307.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I307.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I307.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I307.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I333.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I333.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I333.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I333.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I333.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I333.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I333.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I333.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I400.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I500.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I500.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I727.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I727.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I727.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I727.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I727.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I727.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I727.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I727.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I747.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I747.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I747.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I747.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_I747.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I747.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_I747.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_I747.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J150.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J150.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J150.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J150.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J150.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J222.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J222.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J222.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J222.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J222.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J222.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J222.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J222.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J234.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J234.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J234.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J234.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J234.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J234.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J234.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J234.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J242.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J242.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J242.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J242.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J242.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J242.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J242.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J242.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J245.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J245.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J245.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J245.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J245.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J245.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J245.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J245.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J246.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J246.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J246.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J246.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J246.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J246.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J246.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J246.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J272.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J272.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J272.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J272.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J272.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J272.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J272.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J272.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J292.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J292.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J292.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J292.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J292.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J292.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J292.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J292.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J333.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J333.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J333.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J333.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J333.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J333.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J333.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J333.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J345.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J345.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J345.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J345.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J345.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J345.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J345.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J345.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J355.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J355.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J355.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J355.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J355.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J355.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J355.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J355.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J358.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J358.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J358.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J358.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J358.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J358.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J358.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J358.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J416.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J416.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J416.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J416.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J416.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J416.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J416.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J416.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J555.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J555.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J555.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J555.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J555.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J555.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J555.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J555.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J642.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J642.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J642.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J642.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J642.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J642.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J642.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J642.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_J800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_J800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_J800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K234.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K234.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K234.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K234.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K234.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K234.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K234.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K234.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K265.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K265.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K265.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K265.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K265.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K265.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K265.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K265.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K300.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K300.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K321.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K321.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K321.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K321.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K321.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K321.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K321.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K321.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K404.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K404.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K404.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K404.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K404.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K404.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K404.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K404.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K456.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K456.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K456.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K456.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K456.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K456.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K456.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K456.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K543.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K543.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K543.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K543.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K555.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K555.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K555.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K555.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K630.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K630.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K630.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K630.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K630.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K630.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K630.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K630.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K678.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K678.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K678.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K678.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K678.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K678.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K678.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K678.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K707.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K707.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K707.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K707.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K707.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K707.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K707.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K707.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K777.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K777.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K777.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K777.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K777.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K777.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K777.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K777.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_K888.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K888.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_K888.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_K888.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L1222.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L1222.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L1222.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L1222.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L1222.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L1222.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L1222.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L1222.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L1428.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L1428.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L1428.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L1428.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L2525.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L2525.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L2525.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L2525.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L2525.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L2525.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L2525.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L2525.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L369.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L369.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L369.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L369.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L369.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L369.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L369.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L369.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_L800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_L800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_L800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M1491.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M1491.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M1491.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M1491.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M1575.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M1575.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M1575.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M1575.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M1575.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M1575.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M1575.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M1575.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M2281.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2281.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M2281.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2281.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M2700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M2700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2700.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M2700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M2700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2700.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M2800.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2800.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M2800.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2800.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M2800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M2800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M2800.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M711.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M711.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M711.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M711.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_M711.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M711.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_M711.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_M711.rse diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_O6300.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_O6300.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_O6300.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_O6300.eng diff --git a/core/resources-src/datafiles/thrustcurves/Contrail_O6300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_O6300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Contrail_O6300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Contrail_O6300.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_E12.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_E12.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_E12.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_E12.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_F23.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_F23.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_F23.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_F23.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_G20.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G20.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_G20.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G20.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_G20.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G20.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_G20.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G20.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_G35.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G35.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_G35.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G35.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_G35.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G35.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_G35.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G35.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_G37.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G37.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_G37.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G37.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_G37.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G37.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_G37.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_G37.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_H275.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H275.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_H275.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H275.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_H275.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H275.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_H275.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H275.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_H48.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H48.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_H48.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H48.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_H48.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H48.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_H48.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H48.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_H50.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H50.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_H50.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H50.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_H50.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H50.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_H50.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_H50.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I130.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I130.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I130.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I130.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I130.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I130.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I130.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I130.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I134.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I134.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I134.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I134.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I134.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I134.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I134.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I134.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I150.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I150.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I150.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I150.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I150.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I160.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I160.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I160.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I160.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I160.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I160.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I160.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I160.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I230.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I230.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I230.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I230.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I230.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I230.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I230.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I230.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I69.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I69.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I69.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I69.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_I69.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I69.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_I69.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_I69.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J110.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J110.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J110.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J110.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J110.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J110.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J110.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J110.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J148.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J148.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J148.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J148.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J148.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J148.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J148.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J148.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J228.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J228.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J228.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J228.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J228.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J228.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J228.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J228.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J270.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J270.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J270.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J270.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J270.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J270.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J270.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J270.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J330.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J330.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J330.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J330.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_J330.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J330.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_J330.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_J330.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_K475.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_K475.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_K475.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_K475.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_K475.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_K475.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_K475.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_K475.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_L330.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L330.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_L330.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L330.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_L330.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L330.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_L330.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L330.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_L600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_L600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L600.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_L600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_L600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_L600.rse diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_M1000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_M1000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_M1000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_M1000.eng diff --git a/core/resources-src/datafiles/thrustcurves/Ellis_M1000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_M1000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Ellis_M1000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Ellis_M1000.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_1_2A3.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A3.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_1_2A3.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A3.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_1_2A3.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A3.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_1_2A3.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A3.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_1_2A6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_1_2A6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_1_2A6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_1_2A6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_2A6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_1_4A3.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_4A3.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_1_4A3.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_4A3.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_1_4A3.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_4A3.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_1_4A3.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_1_4A3.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_A10.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A10.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_A10.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A10.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_A10.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A10.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_A10.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A10.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_A3.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A3.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_A3.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A3.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_A3.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A3.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_A3.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A3.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_A8.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A8.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_A8.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A8.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_A8.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A8.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_A8.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_A8.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_B4.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_B4.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_B4.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_B4.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B4.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_B6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_B6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_B6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_B6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_B6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_C11.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C11.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_C11.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C11.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_C11.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C11.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_C11.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C11.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_C5.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C5.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_C5.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C5.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_C5.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C5.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_C5.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C5.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_C6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_C6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_C6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_C6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_C6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_D11.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D11.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_D11.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D11.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_D11.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D11.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_D11.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D11.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_D12.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D12.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_D12.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D12.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_D12.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D12.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_D12.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_D12.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_E12.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E12.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_E12.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E12.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_E30.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E30.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_E30.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E30.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_E9.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E9.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_E9.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E9.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_E9.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E9.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_E9.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_E9.rse diff --git a/core/resources-src/datafiles/thrustcurves/Estes_F26.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F26.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_F26.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F26.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_F50.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F50.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_F50.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_F50.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_G40.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_G40.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_G40.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_G40.eng diff --git a/core/resources-src/datafiles/thrustcurves/Estes_G40_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_G40_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Estes_G40_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Estes_G40_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_H186.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_H186.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_H186.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_H186.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_H225.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_H225.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_H225.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_H225.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_I223.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_I223.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_I223.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_I223.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_I324.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_I324.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_I324.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_I324.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_I389.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_I389.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_I389.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_I389.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_J167.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J167.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_J167.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J167.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_J365.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J365.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_J365.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J365.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_J395.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J395.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_J395.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J395.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_J450.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J450.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_J450.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J450.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_J465.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J465.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_J465.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J465.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_J485.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J485.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_J485.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_J485.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K1075.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K1075.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K1075.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K1075.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K1185.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K1185.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K1185.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K1185.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_K222.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K222.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K222.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K222.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K327.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K327.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K327.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K327.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K470.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K470.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K470.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K470.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K520.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K520.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K520.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K520.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_K533.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K533.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K533.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K533.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K555.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K555.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K555.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K555.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_K630.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K630.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K630.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K630.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K700.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K700.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K700.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K700.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_K763.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K763.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K763.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K763.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K805.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K805.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K805.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K805.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_K980.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K980.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_K980.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_K980.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_L1065.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L1065.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_L1065.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L1065.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_L1150.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L1150.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_L1150.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L1150.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_L425.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L425.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_L425.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L425.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_L695.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L695.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_L695.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L695.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_L789.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L789.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_L789.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L789.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_L985.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L985.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_L985.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_L985.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_M1025.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1025.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_M1025.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1025.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_M1355.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1355.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_M1355.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1355.eng diff --git a/core/resources-src/datafiles/thrustcurves/GR_M1465.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1465.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_M1465.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1465.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_M1610.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1610.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_M1610.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1610.rse diff --git a/core/resources-src/datafiles/thrustcurves/GR_M1665.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1665.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/GR_M1665.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/GR_M1665.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I130.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I130.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I130.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I130.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I136.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I136.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I136.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I136.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I145.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I145.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I145.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I145.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I205.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I205.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I205.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I205.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I222.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I222.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I222.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I222.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I225.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I225.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I225.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I225.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I260.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I260.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I260.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I260.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_I310.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I310.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_I310.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_I310.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J115.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J115.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J115.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J115.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J120.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J120.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J120.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J120.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J150.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J150.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J150.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J150.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J170.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J170.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J170.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J170.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J190.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J190.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J190.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J190.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J220.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J220.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J220.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J220.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J250.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J250_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J250_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J250_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J250_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J270.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J270.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J270.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J270.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J295.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J295.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J295.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J295.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J317.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J317.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J317.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J317.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J330.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J330.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J330.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J330.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_J330_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J330_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_J330_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_J330_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_K240.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_K240.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_K240.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_K240.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L200.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L200.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L200.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L200.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L225.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L225.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L225.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L225.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L350.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L350.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L350.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L350.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L355.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L355.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L355.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L355.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L475.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L475.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L475.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L475.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L535.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L535.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L535.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L535.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L540.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L540.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L540.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L540.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L540_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L540_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L540_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L540_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L550.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L550.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L550.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L550.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L570.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L570.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L570.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L570.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L570_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L570_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L570_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L570_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L575.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L575.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L575.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L575.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L575_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L575_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L575_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L575_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L610.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L610.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L610.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L610.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L625.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L625.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L625.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L625.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L625_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L625_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L625_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L625_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L740.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L740.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L740.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L740.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_L970.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L970.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_L970.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_L970.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M1000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M1000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1000.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M1000_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1000_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M1000_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1000_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M1001.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1001.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M1001.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1001.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M1010.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1010.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M1010.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1010.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M1010_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1010_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M1010_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1010_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M1015.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1015.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M1015.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1015.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M1040.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1040.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M1040.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M1040.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M740.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M740.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M740.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M740.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M956.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M956.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M956.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M956.eng diff --git a/core/resources-src/datafiles/thrustcurves/Hypertek_M960.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M960.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Hypertek_M960.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Hypertek_M960.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_G135.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_G135.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_G135.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_G135.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_G82.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_G82.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_G82.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_G82.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_H130.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_H130.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_H130.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_H130.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_H225.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_H225.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_H225.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_H225.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I170.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I170.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I170.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I170.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I170.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I170.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I170.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I170.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I280.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I280.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I280.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I280.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I280.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I280.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I280.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I280.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I301.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I301.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I301.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I301.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I301.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I301.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I301.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I301.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I310.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I310.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I310.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I310.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I310.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I310.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I310.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I310.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I370.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I370.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I370.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I370.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I370.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I370.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I370.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I370.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I450.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I450.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I450.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I450.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I450.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I450.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I450.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I450.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I550.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I550.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I550.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I550.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_I550.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I550.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_I550.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_I550.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_J405.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J405.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_J405.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J405.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_J405.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J405.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_J405.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J405.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_J520.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J520.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_J520.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J520.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_J605.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J605.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_J605.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J605.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_J605.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J605.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_J605.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J605.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_J740.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J740.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_J740.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_J740.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K1750.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K1750.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K1750.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K1750.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K1750.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K1750.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K1750.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K1750.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K400.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K400.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K600.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K700.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K750.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K750.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K750.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K750.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_K750.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K750.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_K750.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_K750.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_L1000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_L1000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1000.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_L1000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_L1000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1000.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_L1400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_L1400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1400.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_L1400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_L1400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L1400.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_L2300.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L2300.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_L2300.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_L2300.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_M1450.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M1450.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_M1450.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M1450.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_M1450.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M1450.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_M1450.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M1450.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_M2900.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M2900.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_M2900.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M2900.rse diff --git a/core/resources-src/datafiles/thrustcurves/KBA_M3500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M3500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_M3500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M3500.eng diff --git a/core/resources-src/datafiles/thrustcurves/KBA_M3500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M3500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/KBA_M3500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/KBA_M3500.rse diff --git a/core/resources-src/datafiles/thrustcurves/Kosdon_I560.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Kosdon_I560.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Kosdon_I560.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Kosdon_I560.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_G69.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_G69.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_G69.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_G69.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_G80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_G80.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_G80.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_G80.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_G80.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_G80.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_G80.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_G80.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H100.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H100.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H100.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H100.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H100.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H144.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H144.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H144.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H144.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H144.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H144.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H144.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H144.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H160.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H160.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H160.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H160.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H160.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H160.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H160.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H160.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H500.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H500.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H500.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H500.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H500.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H500.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H500.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H500.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H500_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H500_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H500_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H500_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H90.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H90.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H90.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H90.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_H90.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H90.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_H90.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_H90.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I110.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I110.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I110.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I110.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I110.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I110.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I110.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I110.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I210.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I210.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I210.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I210.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I210.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I210.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I210.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I210.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I316.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I316.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I316.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I316.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I405.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I405.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I405.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I405.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I405.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I405.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I405.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I405.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_I430.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I430.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_I430.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_I430.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J1000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J1000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J1000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J1000.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J175.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J175.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J175.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J175.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J175.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J320.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J320.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J320.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J320.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J320.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J320.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J320.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J320.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J350.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J350.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J350.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J350.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J396.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J396.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J396.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J396.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J396.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J396.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J396.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J396.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J525.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J525.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J525.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J525.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J525.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J525.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J525.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J525.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J528.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J528.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J528.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J528.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J528.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J528.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J528.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J528.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J650.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J650.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J650.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J650.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J712.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J712.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J712.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J712.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J712.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J712.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J712.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J712.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J820.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J820.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J820.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J820.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_J820.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J820.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_J820.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_J820.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K250.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K250.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K250.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K250.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K250.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K250.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K250.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K250.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K350.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K350.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K350.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K350.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K350.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K350.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K350.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K350.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K690.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K690.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K690.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K690.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K830.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K830.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K830.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K830.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K960.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K960.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K960.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K960.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_K960.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K960.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_K960.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_K960.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L1400.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1400.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L1400.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1400.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L1400.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1400.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L1400.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1400.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L1482.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1482.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L1482.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1482.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L1482.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1482.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L1482.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L1482.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L480.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L480.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L480.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L480.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L780.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L780.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L780.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L780.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L930.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L930.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L930.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L930.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_L930.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L930.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_L930.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_L930.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M1200.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1200.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M1200.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1200.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M1882.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1882.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M1882.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1882.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M1882.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1882.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M1882.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M1882.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M2550.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M2550.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M2550.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M2550.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M2550.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M2550.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M2550.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M2550.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M3000.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M3000.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M3000.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M3000.eng diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M3000.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M3000.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M3000.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M3000.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_M900.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M900.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_M900.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_M900.rse diff --git a/core/resources-src/datafiles/thrustcurves/Loki_N3800.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_N3800.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Loki_N3800.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Loki_N3800.rse diff --git a/core/resources-src/datafiles/thrustcurves/PML_F50.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/PML_F50.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/PML_F50.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/PML_F50.eng diff --git a/core/resources-src/datafiles/thrustcurves/PML_G40.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/PML_G40.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/PML_G40.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/PML_G40.eng diff --git a/core/resources-src/datafiles/thrustcurves/PML_G80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/PML_G80.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/PML_G80.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/PML_G80.eng diff --git a/core/resources-src/datafiles/thrustcurves/PP_H70.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_H70.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/PP_H70.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_H70.eng diff --git a/core/resources-src/datafiles/thrustcurves/PP_I160.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_I160.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/PP_I160.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_I160.eng diff --git a/core/resources-src/datafiles/thrustcurves/PP_I80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_I80.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/PP_I80.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_I80.eng diff --git a/core/resources-src/datafiles/thrustcurves/PP_J140.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_J140.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/PP_J140.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/PP_J140.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_A6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_A6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_A6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_A6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Quest_A8.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A8.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_A8.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_A8.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_B4.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_B4.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_B4.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_B4.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_B6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_B6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_B6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_B6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_B6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_B6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_B6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_B6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Quest_C6.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_C6.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_C6.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_C6.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_C6.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_C6.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_C6.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_C6.rse diff --git a/core/resources-src/datafiles/thrustcurves/Quest_D5.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_D5.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_D5_1.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5_1.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_D5_1.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5_1.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_D5_2.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5_2.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_D5_2.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D5_2.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_D8.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D8.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_D8.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_D8.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx.rse diff --git a/core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_II.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx_II.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_II.eng diff --git a/core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx_II.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_II.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Quest_Micro_Maxx_II.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Quest_Micro_Maxx_II.rse diff --git a/core/resources-src/datafiles/thrustcurves/RATT_H70.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_H70.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RATT_H70.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_H70.eng diff --git a/core/resources-src/datafiles/thrustcurves/RATT_I80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_I80.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RATT_I80.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_I80.eng diff --git a/core/resources-src/datafiles/thrustcurves/RATT_I90.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_I90.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RATT_I90.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_I90.eng diff --git a/core/resources-src/datafiles/thrustcurves/RATT_J160.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_J160.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RATT_J160.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_J160.eng diff --git a/core/resources-src/datafiles/thrustcurves/RATT_K240.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_K240.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RATT_K240.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_K240.eng diff --git a/core/resources-src/datafiles/thrustcurves/RATT_L600.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_L600.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RATT_L600.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_L600.eng diff --git a/core/resources-src/datafiles/thrustcurves/RATT_M900.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_M900.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RATT_M900.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RATT_M900.eng diff --git a/core/resources-src/datafiles/thrustcurves/README.txt b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/README.txt similarity index 100% rename from core/resources-src/datafiles/thrustcurves/README.txt rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/README.txt diff --git a/core/resources-src/datafiles/thrustcurves/RV_E15.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_E15.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RV_E15.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_E15.eng diff --git a/core/resources-src/datafiles/thrustcurves/RV_F32.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_F32.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RV_F32.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_F32.eng diff --git a/core/resources-src/datafiles/thrustcurves/RV_F72.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_F72.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RV_F72.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_F72.eng diff --git a/core/resources-src/datafiles/thrustcurves/RV_G55.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_G55.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/RV_G55.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/RV_G55.eng diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_E25.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_E25.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_E25.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_E25.eng diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_E25.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_E25.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_E25.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_E25.rse diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_F35.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F35.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_F35.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F35.eng diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_F35.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F35.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_F35.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F35.rse diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_F45.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F45.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_F45.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F45.eng diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_F45.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F45.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_F45.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F45.rse diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_F60.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F60.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_F60.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F60.eng diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_F60.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F60.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_F60.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_F60.rse diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_G80.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_G80.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_G80.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_G80.eng diff --git a/core/resources-src/datafiles/thrustcurves/Roadrunner_G80.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_G80.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/Roadrunner_G80.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/Roadrunner_G80.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_G125.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G125.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_G125.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G125.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_G125.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G125.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_G125.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G125.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_G63.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G63.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_G63.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G63.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_G63.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G63.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_G63.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G63.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_G69.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G69.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_G69.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G69.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_G69.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G69.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_G69.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_G69.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_H124.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H124.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_H124.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H124.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_H124.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H124.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_H124.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H124.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_H155.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H155.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_H155.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H155.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_H155.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H155.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_H155.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H155.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_H78.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H78.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_H78.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H78.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_H78.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H78.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_H78.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_H78.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_I117.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I117.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_I117.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I117.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_I117.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I117.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_I117.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I117.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_I119.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I119.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_I119.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I119.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_I119.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I119.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_I119.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I119.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_I147.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I147.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_I147.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I147.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_I147.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I147.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_I147.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_I147.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_J144.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J144.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_J144.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J144.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_J144.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J144.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_J144.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J144.rse diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_J261.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J261.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_J261.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J261.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_J263.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J263.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_J263.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J263.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_J337.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J337.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_J337.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J337.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_J348.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J348.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_J348.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_J348.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_K257.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_K257.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_K257.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_K257.eng diff --git a/core/resources-src/datafiles/thrustcurves/SkyR_K347.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_K347.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/SkyR_K347.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/SkyR_K347.eng diff --git a/core/resources-src/datafiles/thrustcurves/WCH_G55.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_G55.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/WCH_G55.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_G55.rse diff --git a/core/resources-src/datafiles/thrustcurves/WCH_H100.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_H100.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/WCH_H100.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_H100.rse diff --git a/core/resources-src/datafiles/thrustcurves/WCH_I110.eng b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_I110.eng similarity index 100% rename from core/resources-src/datafiles/thrustcurves/WCH_I110.eng rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_I110.eng diff --git a/core/resources-src/datafiles/thrustcurves/WCH_I110.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_I110.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/WCH_I110.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_I110.rse diff --git a/core/resources-src/datafiles/thrustcurves/WCH_K460.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_K460.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/WCH_K460.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_K460.rse diff --git a/core/resources-src/datafiles/thrustcurves/WCH_L600.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_L600.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/WCH_L600.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_L600.rse diff --git a/core/resources-src/datafiles/thrustcurves/WCH_M700.rse b/core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_M700.rse similarity index 100% rename from core/resources-src/datafiles/thrustcurves/WCH_M700.rse rename to core/resources-src/datafiles/thrustcurves/thrustcurve.org/WCH_M700.rse diff --git a/core/resources/datafiles/thrustcurves/system.ser b/core/resources/datafiles/thrustcurves/thrustcurves.ser similarity index 84% rename from core/resources/datafiles/thrustcurves/system.ser rename to core/resources/datafiles/thrustcurves/thrustcurves.ser index c3151b10f..e1248583d 100644 Binary files a/core/resources/datafiles/thrustcurves/system.ser and b/core/resources/datafiles/thrustcurves/thrustcurves.ser differ diff --git a/core/src/net/sf/openrocket/database/AsynchronousDatabaseLoader.java b/core/src/net/sf/openrocket/database/AsynchronousDatabaseLoader.java new file mode 100644 index 000000000..71bda4757 --- /dev/null +++ b/core/src/net/sf/openrocket/database/AsynchronousDatabaseLoader.java @@ -0,0 +1,130 @@ +package net.sf.openrocket.database; + +/** + * A class that manages calling a DatabaseLoader in the background. + * + * @author Sampo Niskanen + */ +public abstract class AsynchronousDatabaseLoader { + + private final long startupDelay; + + private volatile boolean startedLoading = false; + private volatile boolean endedLoading = false; + private volatile boolean inUse = false; + + /** + * Sole constructor. + *

+ * The startupDelay parameter defines a time to delay after calling startLoading before + * actually starting the loading. This allows other actions such as GUI opening + * to proceed faster. The delay can be cancelled by calling setInUse(). + * + * @param startupDelay number of milliseconds to delay before starting actual loading. + */ + public AsynchronousDatabaseLoader(long startupDelay) { + this.startupDelay = startupDelay; + } + + + + /** + * Start loading the database. Creates a new thread for the loading and returns immediately. + * + * @throws IllegalStateException if this method has already been called. + */ + public void startLoading() { + if (startedLoading) { + throw new IllegalStateException("Already called startLoading"); + } + startedLoading = true; + new LoadingThread().start(); + } + + + /** + * Return whether loading the database has ended. + */ + public boolean isLoaded() { + return endedLoading; + } + + + /** + * Cancel the startup delay (if still ongoing), and start loading the database immediately. + */ + public void cancelStartupDelay() { + if (!inUse) { + synchronized (this) { + inUse = true; + this.notifyAll(); + } + } + } + + + /** + * Block the current thread until loading of the motors has been completed. + * This also cancels any ongoing startup delay. + * + * @throws IllegalStateException if startLoading() has not been called. + */ + public void blockUntilLoaded() { + if (!startedLoading) { + throw new IllegalStateException("startLoading() has not been called"); + } + if (!endedLoading) { + cancelStartupDelay(); + synchronized (this) { + while (!endedLoading) { + try { + this.wait(); + } catch (InterruptedException e) { + } + } + } + } + } + + + private void doLoad() { + + // Pause for indicated startup time + long startLoading = System.currentTimeMillis() + startupDelay; + while (!inUse && System.currentTimeMillis() < startLoading) { + synchronized (this) { + try { + this.wait(startLoading - System.currentTimeMillis()); + } catch (InterruptedException e) { + } + } + } + + loadDatabase(); + + synchronized (this) { + endedLoading = true; + this.notifyAll(); + } + } + + + protected abstract void loadDatabase(); + + + /** + * Background thread for loading the database. + */ + private class LoadingThread extends Thread { + private LoadingThread() { + this.setName("DatabaseLoadingThread"); + this.setPriority(MIN_PRIORITY); + } + + @Override + public void run() { + doLoad(); + } + } + +} diff --git a/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java b/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java deleted file mode 100644 index a1155c78d..000000000 --- a/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java +++ /dev/null @@ -1,218 +0,0 @@ -package net.sf.openrocket.database; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.sf.openrocket.logging.LogHelper; -import net.sf.openrocket.motor.Motor; -import net.sf.openrocket.motor.ThrustCurveMotor; -import net.sf.openrocket.startup.Application; - -/** - * A database containing ThrustCurveMotorSet objects and allowing adding a motor - * to the database. - * - * @author Sampo Niskanen - */ -public abstract class ThrustCurveMotorSetDatabase implements MotorDatabase { - - private static final LogHelper logger = Application.getLogger(); - - protected List motorSets; - - private volatile boolean startedLoading = false; - private volatile boolean endedLoading = false; - private final boolean asynchronous; - - /** Set to true the first time {@link #blockUntilLoaded()} is called. */ - protected volatile boolean inUse = false; - - /** - * Sole constructor. - * - * @param asynchronous whether to load motors asynchronously in a background thread. - */ - public ThrustCurveMotorSetDatabase(boolean asynchronous) { - this.asynchronous = asynchronous; - } - - - /* (non-Javadoc) - * @see net.sf.openrocket.database.ThrustCurveMotorSetDatabaseI#getMotorSets() - */ - public List getMotorSets() { - blockUntilLoaded(); - return motorSets; - } - - - - /* (non-Javadoc) - * @see net.sf.openrocket.database.ThrustCurveMotorSetDatabaseI#findMotors(net.sf.openrocket.motor.Motor.Type, java.lang.String, java.lang.String, double, double) - */ - @Override - public List findMotors(Motor.Type type, String manufacturer, String designation, - double diameter, double length) { - blockUntilLoaded(); - ArrayList results = new ArrayList(); - - for (ThrustCurveMotorSet set : motorSets) { - for (ThrustCurveMotor m : set.getMotors()) { - boolean match = true; - if (type != null && type != set.getType()) - match = false; - else if (manufacturer != null && !m.getManufacturer().matches(manufacturer)) - match = false; - else if (designation != null && !designation.equalsIgnoreCase(m.getDesignation())) - match = false; - else if (!Double.isNaN(diameter) && (Math.abs(diameter - m.getDiameter()) > 0.0015)) - match = false; - else if (!Double.isNaN(length) && (Math.abs(length - m.getLength()) > 0.0015)) - match = false; - - if (match) - results.add(m); - } - } - - return results; - } - - - /** - * Add a motor to the database. If a matching ThrustCurveMototSet is found, - * the motor is added to that set, otherwise a new set is created and added to the - * database. - * - * @param motor the motor to add - */ - protected void addMotor(ThrustCurveMotor motor) { - // Iterate from last to first, as this is most likely to hit early when loading files - for (int i = motorSets.size() - 1; i >= 0; i--) { - ThrustCurveMotorSet set = motorSets.get(i); - if (set.matches(motor)) { - set.addMotor(motor); - return; - } - } - - ThrustCurveMotorSet newSet = new ThrustCurveMotorSet(); - newSet.addMotor(motor); - motorSets.add(newSet); - } - - - - - - /** - * Start loading the motors. Creates a new thread for the loading if asynchronous. - * - * @throws IllegalStateException if this method has already been called. - */ - public void startLoading() { - if (startedLoading) { - throw new IllegalStateException("Already called startLoading"); - } - startedLoading = true; - if (asynchronous) { - new LoadingThread().start(); - } else { - performMotorLoading(); - } - } - - - /** - * Return whether loading the database has ended. - * - * @return whether background loading has ended. - */ - public boolean isLoaded() { - return endedLoading; - } - - - /** - * Mark that this database is in use or a place is waiting for the database to - * become loaded. This can be used in conjunction with {@link #isLoaded()} to load - * the database without blocking. - */ - public void setInUse() { - inUse = true; - } - - - /** - * Block the current thread until loading of the motors has been completed. - * - * @throws IllegalStateException if startLoading() has not been called. - */ - public void blockUntilLoaded() { - inUse = true; - if (!startedLoading) { - throw new IllegalStateException("startLoading() has not been called"); - } - if (!endedLoading) { - synchronized (this) { - while (!endedLoading) { - try { - this.wait(); - } catch (InterruptedException e) { - logger.warn("InterruptedException occurred, ignoring", e); - } - } - } - } - } - - - /** - * Used for loading the motor database. This method will be called in a background - * thread to load the motors asynchronously. This method should call - * {@link #addMotor(ThrustCurveMotor)} to add the motors to the database. - */ - protected abstract void loadMotors(); - - - - /** - * Creates the motor list, calls {@link #loadMotors()}, sorts the list and marks - * the motors as loaded. This method is called either synchronously or from the - * background thread. - */ - private void performMotorLoading() { - motorSets = new ArrayList(); - try { - loadMotors(); - } catch (Exception e) { - logger.error("Loading motors failed", e); - } - Collections.sort(motorSets); - motorSets = Collections.unmodifiableList(motorSets); - synchronized (ThrustCurveMotorSetDatabase.this) { - endedLoading = true; - ThrustCurveMotorSetDatabase.this.notifyAll(); - } - } - - - /** - * Background thread for loading the motors. This creates the motor list, - * calls loadMotors(), sorts the database, makes it unmodifiable, and finally - * marks the database as loaded and notifies any blocked threads. - */ - private class LoadingThread extends Thread { - private LoadingThread() { - this.setName("MotorLoadingThread"); - this.setPriority(MIN_PRIORITY); - } - - @Override - public void run() { - performMotorLoading(); - } - } - -} diff --git a/core/src/net/sf/openrocket/database/MotorDatabase.java b/core/src/net/sf/openrocket/database/motor/MotorDatabase.java similarity index 90% rename from core/src/net/sf/openrocket/database/MotorDatabase.java rename to core/src/net/sf/openrocket/database/motor/MotorDatabase.java index 0a1e9095a..07758ce05 100644 --- a/core/src/net/sf/openrocket/database/MotorDatabase.java +++ b/core/src/net/sf/openrocket/database/motor/MotorDatabase.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.database; +package net.sf.openrocket.database.motor; import java.util.List; diff --git a/core/src/net/sf/openrocket/database/ThrustCurveMotorSet.java b/core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSet.java similarity index 99% rename from core/src/net/sf/openrocket/database/ThrustCurveMotorSet.java rename to core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSet.java index 3bcadad90..bc017e7fa 100644 --- a/core/src/net/sf/openrocket/database/ThrustCurveMotorSet.java +++ b/core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSet.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.database; +package net.sf.openrocket.database.motor; import java.text.Collator; import java.util.Collections; diff --git a/core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSetDatabase.java b/core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSetDatabase.java new file mode 100644 index 000000000..674522072 --- /dev/null +++ b/core/src/net/sf/openrocket/database/motor/ThrustCurveMotorSetDatabase.java @@ -0,0 +1,79 @@ +package net.sf.openrocket.database.motor; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import net.sf.openrocket.motor.Motor; +import net.sf.openrocket.motor.ThrustCurveMotor; + +/** + * A database containing ThrustCurveMotorSet objects and allowing adding a motor + * to the database. + * + * @author Sampo Niskanen + */ +public class ThrustCurveMotorSetDatabase implements MotorDatabase { + + private final List motorSets = new ArrayList(); + + + @Override + public List findMotors(Motor.Type type, String manufacturer, String designation, + double diameter, double length) { + ArrayList results = new ArrayList(); + + for (ThrustCurveMotorSet set : motorSets) { + for (ThrustCurveMotor m : set.getMotors()) { + boolean match = true; + if (type != null && type != set.getType()) + match = false; + else if (manufacturer != null && !m.getManufacturer().matches(manufacturer)) + match = false; + else if (designation != null && !designation.equalsIgnoreCase(m.getDesignation())) + match = false; + else if (!Double.isNaN(diameter) && (Math.abs(diameter - m.getDiameter()) > 0.0015)) + match = false; + else if (!Double.isNaN(length) && (Math.abs(length - m.getLength()) > 0.0015)) + match = false; + + if (match) + results.add(m); + } + } + + return results; + } + + + /** + * Return a list of all ThrustCurveMotorSets. + */ + public List getMotorSets() { + return Collections.unmodifiableList(motorSets); + } + + + /** + * Add a motor to the database. If a matching ThrustCurveMototSet is found, + * the motor is added to that set, otherwise a new set is created and added to the + * database. + * + * @param motor the motor to add + */ + public void addMotor(ThrustCurveMotor motor) { + // Iterate from last to first, as this is most likely to hit early when loading files + for (int i = motorSets.size() - 1; i >= 0; i--) { + ThrustCurveMotorSet set = motorSets.get(i); + if (set.matches(motor)) { + set.addMotor(motor); + return; + } + } + + ThrustCurveMotorSet newSet = new ThrustCurveMotorSet(); + newSet.addMotor(motor); + motorSets.add(newSet); + } + +} diff --git a/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java b/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java deleted file mode 100644 index 5a26d018b..000000000 --- a/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java +++ /dev/null @@ -1,116 +0,0 @@ -package net.sf.openrocket.gui.dialogs; - -import java.awt.SplashScreen; -import java.awt.Window; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.Timer; - -import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; -import net.sf.openrocket.gui.main.Splash; -import net.sf.openrocket.gui.util.GUIUtil; -import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; -import net.sf.openrocket.startup.Application; - -/** - * A progress dialog displayed while loading motors. - * - * @author Sampo Niskanen - */ -public class MotorDatabaseLoadingDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); - private static final Translator trans = Application.getTranslator(); - - - private MotorDatabaseLoadingDialog(Window parent) { - //// Loading motors - super(parent, trans.get("MotorDbLoadDlg.title"), ModalityType.APPLICATION_MODAL); - - JPanel panel = new JPanel(new MigLayout("fill")); - //// Loading motors... - panel.add(new JLabel(trans.get("MotorDbLoadDlg.Loadingmotors")), "wrap para"); - - JProgressBar progress = new JProgressBar(); - progress.setIndeterminate(true); - panel.add(progress, "growx"); - - this.add(panel); - this.pack(); - this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - this.setLocationByPlatform(true); - GUIUtil.setWindowIcons(this); - } - - - /** - * Check whether the motor database is loaded and block until it is. - * An uncloseable modal dialog window is opened while loading unless the splash screen - * is still being displayed. - * - * @param parent the parent window for the dialog, or null - */ - public static void check(Window parent) { - // TODO - ugly blind cast - final ThrustCurveMotorSetDatabase db = (ThrustCurveMotorSetDatabase) Application.getMotorSetDatabase(); - if (db.isLoaded()) - return; - - SplashScreen splash = Splash.getSplashScreen(); - if (splash == null || !splash.isVisible()) { - - log.info(1, "Motor database not loaded yet, displaying dialog"); - - final MotorDatabaseLoadingDialog dialog = new MotorDatabaseLoadingDialog(parent); - - final Timer timer = new Timer(100, new ActionListener() { - private int count = 0; - - @Override - public void actionPerformed(ActionEvent e) { - count++; - if (db.isLoaded()) { - log.debug("Database loaded, closing dialog"); - dialog.setVisible(false); - } else if (count % 10 == 0) { - log.debug("Database not loaded, count=" + count); - } - } - }); - - db.setInUse(); - timer.start(); - dialog.setVisible(true); - timer.stop(); - - } else { - - log.info(1, "Motor database not loaded yet, splash screen still present, delaying until loaded"); - - db.setInUse(); - int count = 0; - while (!db.isLoaded()) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - // No-op - } - - count++; - if (count % 10 == 0) { - log.debug("Database not loaded, count=" + count); - } - } - - } - - log.info("Motor database now loaded"); - } - -} diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java b/core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java index ca4205d2d..761d4dab6 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java @@ -12,7 +12,6 @@ import javax.swing.JDialog; import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.gui.dialogs.MotorDatabaseLoadingDialog; import net.sf.openrocket.gui.dialogs.motor.thrustcurve.ThrustCurveMotorSelectionPanel; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; @@ -26,22 +25,19 @@ public class MotorChooserDialog extends JDialog implements CloseableDialog { private boolean okClicked = false; private static final Translator trans = Application.getTranslator(); - + public MotorChooserDialog(Motor current, double delay, double diameter, Window owner) { - super(owner, trans.get ("MotorChooserDialog.title"), Dialog.ModalityType.APPLICATION_MODAL); + super(owner, trans.get("MotorChooserDialog.title"), Dialog.ModalityType.APPLICATION_MODAL); - // Check that the motor database has been loaded properly - MotorDatabaseLoadingDialog.check(null); - JPanel panel = new JPanel(new MigLayout("fill")); selectionPanel = new ThrustCurveMotorSelectionPanel((ThrustCurveMotor) current, delay, diameter); panel.add(selectionPanel, "grow, wrap para"); - + // OK / Cancel buttons JButton okButton = new JButton(trans.get("dlg.but.ok")); okButton.addActionListener(new ActionListener() { @@ -100,7 +96,7 @@ public class MotorChooserDialog extends JDialog implements CloseableDialog { } - + @Override public void close(boolean ok) { okClicked = ok; diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java index 7520a01bc..c99c7b5b6 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java @@ -3,7 +3,7 @@ package net.sf.openrocket.gui.dialogs.motor.thrustcurve; import java.text.Collator; import java.util.Comparator; -import net.sf.openrocket.database.ThrustCurveMotorSet; +import net.sf.openrocket.database.motor.ThrustCurveMotorSet; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.motor.DesignationComparator; import net.sf.openrocket.motor.ThrustCurveMotor; diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java index 2dc92bd31..bb1d9de5f 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java @@ -4,7 +4,7 @@ import java.util.List; import javax.swing.table.AbstractTableModel; -import net.sf.openrocket.database.ThrustCurveMotorSet; +import net.sf.openrocket.database.motor.ThrustCurveMotorSet; class ThrustCurveMotorDatabaseModel extends AbstractTableModel { private final List database; diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index 7deaaa8f1..b2f7ecb07 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -43,8 +43,7 @@ import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.database.ThrustCurveMotorSet; -import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; +import net.sf.openrocket.database.motor.ThrustCurveMotorSet; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.dialogs.motor.CloseableDialog; @@ -163,8 +162,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec // Construct the database (adding the current motor if not in the db already) List db; - // TODO - ugly blind cast. - db = ((ThrustCurveMotorSetDatabase) Application.getMotorSetDatabase()).getMotorSets(); + db = Application.getThrustCurveMotorSetDatabase().getMotorSets(); // If current motor is not found in db, add a new ThrustCurveMotorSet containing it if (current != null) { diff --git a/core/src/net/sf/openrocket/gui/figure3d/Quick3dMain.java b/core/src/net/sf/openrocket/gui/figure3d/Quick3dMain.java index d7c2e842c..cb119ea7f 100644 --- a/core/src/net/sf/openrocket/gui/figure3d/Quick3dMain.java +++ b/core/src/net/sf/openrocket/gui/figure3d/Quick3dMain.java @@ -1,11 +1,11 @@ package net.sf.openrocket.gui.figure3d; + import java.awt.BorderLayout; import javax.swing.JFrame; import javax.swing.JPanel; import net.sf.openrocket.database.ComponentPresetDatabase; -import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DatabaseMotorFinder; import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader; @@ -22,50 +22,51 @@ import net.sf.openrocket.startup.Application; * */ public class Quick3dMain { - + /** * @param args */ public static void main(String[] args) throws Exception { Application.setBaseTranslator(new ResourceBundleTranslator( "l10n.messages")); - Application.setMotorSetDatabase(new ThrustCurveMotorSetDatabase(false) { - { - startLoading(); - } - - @Override - protected void loadMotors() { - } - }); + // TODO: broken code due to motor db refactoring - now using Guice injectors + // Application.setMotorSetDatabase(new ThrustCurveMotorSetDatabase(false) { + // { + // startLoading(); + // } + // + // @Override + // protected void loadMotors() { + // } + // }); Application.setPreferences(new SwingPreferences()); // Must be done after localization is initialized ComponentPresetDatabase componentPresetDao = new ComponentPresetDatabase() { - + @Override protected void load() { // This test app doesn't need any presets loaded - just an empty database. } }; - Application.setComponentPresetDao( componentPresetDao ); - + Application.setComponentPresetDao(componentPresetDao); + OpenRocketDocument doc = new OpenRocketLoader().loadFromStream( Quick3dMain.class.getResourceAsStream("/datafiles/examples/Clustered rocket design.ork"), new DatabaseMotorFinder()); - + JFrame ff = new JFrame(); ff.setSize(1200, 400); ff.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - + RocketPanel panel; - + panel = new RocketPanel(doc); - + ComponentTree ct = new ComponentTree(doc); panel.setSelectionModel(ct.getSelectionModel()); - + JPanel p = new JPanel(); p.setLayout(new BorderLayout()); p.add(ct, BorderLayout.WEST); diff --git a/core/src/net/sf/openrocket/gui/main/BasicFrame.java b/core/src/net/sf/openrocket/gui/main/BasicFrame.java index 2b59e9cc6..df5256c84 100644 --- a/core/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/core/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -1,54 +1,31 @@ package net.sf.openrocket.gui.main; -import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.aerodynamics.WarningSet; -import net.sf.openrocket.document.OpenRocketDocument; -import net.sf.openrocket.file.GeneralRocketLoader; -import net.sf.openrocket.file.RocketLoadException; -import net.sf.openrocket.file.RocketLoader; -import net.sf.openrocket.file.RocketSaver; -import net.sf.openrocket.file.openrocket.OpenRocketSaver; -import net.sf.openrocket.file.rocksim.export.RocksimSaver; -import net.sf.openrocket.gui.StorageOptionChooser; -import net.sf.openrocket.gui.configdialog.ComponentConfigDialog; -import net.sf.openrocket.gui.customexpression.CustomExpressionDialog; -import net.sf.openrocket.gui.dialogs.AboutDialog; -import net.sf.openrocket.gui.dialogs.BugReportDialog; -import net.sf.openrocket.gui.dialogs.ComponentAnalysisDialog; -import net.sf.openrocket.gui.dialogs.DebugLogDialog; -import net.sf.openrocket.gui.dialogs.DetailDialog; -import net.sf.openrocket.gui.dialogs.ExampleDesignDialog; -import net.sf.openrocket.gui.dialogs.LicenseDialog; -import net.sf.openrocket.gui.dialogs.MotorDatabaseLoadingDialog; -import net.sf.openrocket.gui.dialogs.PrintDialog; -import net.sf.openrocket.gui.dialogs.ScaleDialog; -import net.sf.openrocket.gui.dialogs.SwingWorkerDialog; -import net.sf.openrocket.gui.dialogs.WarningDialog; -import net.sf.openrocket.gui.dialogs.optimization.GeneralOptimizationDialog; -import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog; -import net.sf.openrocket.gui.help.tours.GuidedTourSelectionDialog; -import net.sf.openrocket.gui.main.componenttree.ComponentTree; -import net.sf.openrocket.gui.preset.ComponentPresetEditor; -import net.sf.openrocket.gui.scalefigure.RocketPanel; -import net.sf.openrocket.gui.util.FileHelper; -import net.sf.openrocket.gui.util.GUIUtil; -import net.sf.openrocket.gui.util.Icons; -import net.sf.openrocket.gui.util.OpenFileWorker; -import net.sf.openrocket.gui.util.SaveFileWorker; -import net.sf.openrocket.gui.util.SwingPreferences; -import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; -import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; -import net.sf.openrocket.rocketcomponent.ComponentChangeListener; -import net.sf.openrocket.rocketcomponent.Rocket; -import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.rocketcomponent.Stage; -import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.MemoryManagement; -import net.sf.openrocket.util.MemoryManagement.MemoryData; -import net.sf.openrocket.util.Reflection; -import net.sf.openrocket.util.TestRockets; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Toolkit; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.ExecutionException; import javax.swing.Action; import javax.swing.BorderFactory; @@ -80,81 +57,104 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Toolkit; -import java.awt.Window; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.ExecutionException; + +import net.miginfocom.swing.MigLayout; +import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.document.OpenRocketDocument; +import net.sf.openrocket.file.GeneralRocketLoader; +import net.sf.openrocket.file.RocketLoadException; +import net.sf.openrocket.file.RocketLoader; +import net.sf.openrocket.file.RocketSaver; +import net.sf.openrocket.file.openrocket.OpenRocketSaver; +import net.sf.openrocket.file.rocksim.export.RocksimSaver; +import net.sf.openrocket.gui.StorageOptionChooser; +import net.sf.openrocket.gui.configdialog.ComponentConfigDialog; +import net.sf.openrocket.gui.customexpression.CustomExpressionDialog; +import net.sf.openrocket.gui.dialogs.AboutDialog; +import net.sf.openrocket.gui.dialogs.BugReportDialog; +import net.sf.openrocket.gui.dialogs.ComponentAnalysisDialog; +import net.sf.openrocket.gui.dialogs.DebugLogDialog; +import net.sf.openrocket.gui.dialogs.DetailDialog; +import net.sf.openrocket.gui.dialogs.ExampleDesignDialog; +import net.sf.openrocket.gui.dialogs.LicenseDialog; +import net.sf.openrocket.gui.dialogs.PrintDialog; +import net.sf.openrocket.gui.dialogs.ScaleDialog; +import net.sf.openrocket.gui.dialogs.SwingWorkerDialog; +import net.sf.openrocket.gui.dialogs.WarningDialog; +import net.sf.openrocket.gui.dialogs.optimization.GeneralOptimizationDialog; +import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog; +import net.sf.openrocket.gui.help.tours.GuidedTourSelectionDialog; +import net.sf.openrocket.gui.main.componenttree.ComponentTree; +import net.sf.openrocket.gui.preset.ComponentPresetEditor; +import net.sf.openrocket.gui.scalefigure.RocketPanel; +import net.sf.openrocket.gui.util.FileHelper; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.Icons; +import net.sf.openrocket.gui.util.OpenFileWorker; +import net.sf.openrocket.gui.util.SaveFileWorker; +import net.sf.openrocket.gui.util.SwingPreferences; +import net.sf.openrocket.l10n.Translator; +import net.sf.openrocket.logging.LogHelper; +import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; +import net.sf.openrocket.rocketcomponent.ComponentChangeListener; +import net.sf.openrocket.rocketcomponent.Rocket; +import net.sf.openrocket.rocketcomponent.RocketComponent; +import net.sf.openrocket.rocketcomponent.Stage; +import net.sf.openrocket.startup.Application; +import net.sf.openrocket.util.BugException; +import net.sf.openrocket.util.MemoryManagement; +import net.sf.openrocket.util.MemoryManagement.MemoryData; +import net.sf.openrocket.util.Reflection; +import net.sf.openrocket.util.TestRockets; public class BasicFrame extends JFrame { private static final LogHelper log = Application.getLogger(); - + /** * The RocketLoader instance used for loading all rocket designs. */ private static final RocketLoader ROCKET_LOADER = new GeneralRocketLoader(); - + private static final RocketSaver ROCKET_SAVER = new OpenRocketSaver(); - + private static final Translator trans = Application.getTranslator(); - + public static final int COMPONENT_TAB = 0; public static final int SIMULATION_TAB = 1; - - + + /** * List of currently open frames. When the list goes empty * it is time to exit the application. */ private static final ArrayList frames = new ArrayList(); - - + + /** * Whether "New" and "Open" should replace this frame. * Should be set to false on the first rocket modification. */ private boolean replaceable = false; - - - + + + private final OpenRocketDocument document; private final Rocket rocket; - + private JTabbedPane tabbedPane; private RocketPanel rocketpanel; private ComponentTree tree = null; - + private final DocumentSelectionModel selectionModel; private final TreeSelectionModel componentSelectionModel; private final ListSelectionModel simulationSelectionModel; - + /** Actions available for rocket modifications */ private final RocketActions actions; - - - - + + + + /** * Sole constructor. Creates a new frame based on the supplied document * and adds it to the current frames list. @@ -163,82 +163,82 @@ public class BasicFrame extends JFrame { */ public BasicFrame(OpenRocketDocument document) { log.debug("Instantiating new BasicFrame"); - + this.document = document; this.rocket = document.getRocket(); this.rocket.getDefaultConfiguration().setAllStages(); - + // Create the component tree selection model that will be used componentSelectionModel = new DefaultTreeSelectionModel(); componentSelectionModel.setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); - + // Obtain the simulation selection model that will be used SimulationPanel simulationPanel = new SimulationPanel(document); simulationSelectionModel = simulationPanel.getSimulationListSelectionModel(); - + // Combine into a DocumentSelectionModel selectionModel = new DocumentSelectionModel(document); selectionModel.attachComponentTreeSelectionModel(componentSelectionModel); selectionModel.attachSimulationListSelectionModel(simulationSelectionModel); - - + + actions = new RocketActions(document, selectionModel, this); - - + + log.debug("Constructing the BasicFrame UI"); - + // The main vertical split pane JSplitPane vertical = new JSplitPane(JSplitPane.VERTICAL_SPLIT, true); vertical.setResizeWeight(0.5); this.add(vertical); - - + + // The top tabbed pane tabbedPane = new JTabbedPane(); //// Rocket design tabbedPane.addTab(trans.get("BasicFrame.tab.Rocketdesign"), null, designTab()); //// Flight simulations tabbedPane.addTab(trans.get("BasicFrame.tab.Flightsim"), null, simulationPanel); - + vertical.setTopComponent(tabbedPane); - - - + + + // Bottom segment, rocket figure - + rocketpanel = new RocketPanel(document); vertical.setBottomComponent(rocketpanel); - + rocketpanel.setSelectionModel(tree.getSelectionModel()); - - + + createMenu(); - - + + rocket.addComponentChangeListener(new ComponentChangeListener() { @Override public void componentChanged(ComponentChangeEvent e) { setTitle(); } }); - + setTitle(); this.pack(); - - + + // Set initial window size Dimension size = Toolkit.getDefaultToolkit().getScreenSize(); size.width = size.width * 9 / 10; size.height = size.height * 9 / 10; this.setSize(size); - + // Remember changed size GUIUtil.rememberWindowSize(this); - + this.setLocationByPlatform(true); - + GUIUtil.setWindowIcons(this); - + this.validate(); vertical.setDividerLocation(0.4); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); @@ -248,12 +248,12 @@ public class BasicFrame extends JFrame { closeAction(); } }); - + frames.add(this); log.debug("BasicFrame instantiation complete"); } - - + + /** * Construct the "Rocket design" tab. This contains a horizontal split pane * with the left component the design tree and the right component buttons @@ -262,15 +262,15 @@ public class BasicFrame extends JFrame { private JComponent designTab() { JSplitPane horizontal = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true); horizontal.setResizeWeight(0.5); - - + + // Upper-left segment, component tree - + JPanel panel = new JPanel(new MigLayout("fill, flowy", "", "[grow]")); - + tree = new ComponentTree(document); tree.setSelectionModel(componentSelectionModel); - + // Remove JTree key events that interfere with menu accelerators InputMap im = SwingUtilities.getUIInputMap(tree, JComponent.WHEN_FOCUSED); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.CTRL_MASK), null); @@ -280,9 +280,9 @@ public class BasicFrame extends JFrame { im.put(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK), null); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK), null); im.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.CTRL_MASK), null); - - - + + + // Double-click opens config dialog MouseListener ml = new MouseAdapter() { @Override @@ -300,7 +300,7 @@ public class BasicFrame extends JFrame { } }; tree.addMouseListener(ml); - + // Update dialog when selection is changed componentSelectionModel.addTreeSelectionListener(new TreeSelectionListener() { @Override @@ -310,7 +310,7 @@ public class BasicFrame extends JFrame { if (path == null) return; tree.scrollPathToVisible(path); - + if (!ComponentConfigDialog.isDialogVisible()) return; RocketComponent c = (RocketComponent) path.getLastPathComponent(); @@ -318,57 +318,57 @@ public class BasicFrame extends JFrame { BasicFrame.this.document, c); } }); - + // Place tree inside scroll pane JScrollPane scroll = new JScrollPane(tree); panel.add(scroll, "spany, grow, wrap"); - - + + // Buttons JButton button = new JButton(actions.getMoveUpAction()); panel.add(button, "sizegroup buttons, aligny 65%"); - + button = new JButton(actions.getMoveDownAction()); panel.add(button, "sizegroup buttons, aligny 0%"); - + button = new JButton(actions.getEditAction()); panel.add(button, "sizegroup buttons"); - + button = new JButton(actions.getNewStageAction()); panel.add(button, "sizegroup buttons"); - + button = new JButton(actions.getDeleteAction()); button.setIcon(null); button.setMnemonic(0); panel.add(button, "sizegroup buttons"); - + horizontal.setLeftComponent(panel); - - + + // Upper-right segment, component addition buttons - + panel = new JPanel(new MigLayout("fill, insets 0", "[0::]")); - + scroll = new JScrollPane(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scroll.setViewportView(new ComponentAddButtons(document, componentSelectionModel, scroll.getViewport())); scroll.setBorder(null); scroll.setViewportBorder(null); - + TitledBorder border = BorderFactory.createTitledBorder(trans.get("BasicFrame.title.Addnewcomp")); GUIUtil.changeFontStyle(border, Font.BOLD); scroll.setBorder(border); - + panel.add(scroll, "grow"); - + horizontal.setRightComponent(panel); - + return horizontal; } - - - + + + /** * Return the currently selected rocket component, or null if none selected. */ @@ -377,11 +377,11 @@ public class BasicFrame extends JFrame { if (path == null) return null; tree.scrollPathToVisible(path); - + return (RocketComponent) path.getLastPathComponent(); } - - + + /** * Creates the menu for the window. */ @@ -389,14 +389,14 @@ public class BasicFrame extends JFrame { JMenuBar menubar = new JMenuBar(); JMenu menu; JMenuItem item; - + //// File menu = new JMenu(trans.get("main.menu.file")); menu.setMnemonic(KeyEvent.VK_F); //// File-handling related tasks menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.file.desc")); menubar.add(menu); - + //// New item = new JMenuItem(trans.get("main.menu.file.new"), KeyEvent.VK_N); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.CTRL_MASK)); @@ -413,7 +413,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Open... item = new JMenuItem(trans.get("main.menu.file.open"), KeyEvent.VK_O); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK)); @@ -428,14 +428,14 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Open Recent... item = new MRUDesignFileAction(trans.get("main.menu.file.openRecent"), this); //// Open a recent rocket design item.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.item.Openrecentrocketdesign")); item.setIcon(Icons.FILE_OPEN); menu.add(item); - + //// Open example... item = new JMenuItem(trans.get("main.menu.file.openExample")); //// Open an example rocket design @@ -457,9 +457,9 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + menu.addSeparator(); - + //// Save item = new JMenuItem(trans.get("main.menu.file.save"), KeyEvent.VK_S); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, ActionEvent.CTRL_MASK)); @@ -474,7 +474,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Save as... item = new JMenuItem(trans.get("main.menu.file.saveAs"), KeyEvent.VK_A); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, @@ -490,7 +490,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Print... item = new JMenuItem(trans.get("main.menu.file.print"), KeyEvent.VK_P); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.CTRL_MASK)); @@ -505,10 +505,10 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - + + menu.addSeparator(); - + //// Close item = new JMenuItem(trans.get("main.menu.file.close"), KeyEvent.VK_C); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK)); @@ -523,9 +523,9 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + menu.addSeparator(); - + //// Quit item = new JMenuItem(trans.get("main.menu.file.quit"), KeyEvent.VK_Q); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK)); @@ -540,26 +540,26 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - - + + + //// Edit menu = new JMenu(trans.get("main.menu.edit")); menu.setMnemonic(KeyEvent.VK_E); //// Rocket editing menu.getAccessibleContext().setAccessibleDescription(trans.get("BasicFrame.menu.Rocketedt")); menubar.add(menu); - - + + Action action = UndoRedoAction.newUndoAction(document); item = new JMenuItem(action); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Z, ActionEvent.CTRL_MASK)); item.setMnemonic(KeyEvent.VK_U); //// Undo the previous operation item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.undo.desc")); - + menu.add(item); - + action = UndoRedoAction.newRedoAction(document); item = new JMenuItem(action); item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Y, ActionEvent.CTRL_MASK)); @@ -567,26 +567,26 @@ public class BasicFrame extends JFrame { //// Redo the previously undone operation item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.redo.desc")); menu.add(item); - + menu.addSeparator(); - - + + item = new JMenuItem(actions.getCutAction()); menu.add(item); - + item = new JMenuItem(actions.getCopyAction()); menu.add(item); - + item = new JMenuItem(actions.getPasteAction()); menu.add(item); - + item = new JMenuItem(actions.getDeleteAction()); menu.add(item); - + menu.addSeparator(); - - - + + + item = new JMenuItem(trans.get("main.menu.edit.resize")); item.setIcon(Icons.EDIT_SCALE); item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.edit.resize.desc")); @@ -600,9 +600,9 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - - + + + //// Preferences item = new JMenuItem(trans.get("main.menu.edit.preferences")); item.setIcon(Icons.PREFERENCES); @@ -616,31 +616,31 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Edit Component Preset File - - if (System.getProperty("openrocket.preseteditor.menu") != null) { - item = new JMenuItem(trans.get("main.menu.edit.editpreset")); - item.addActionListener( new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - JFrame dialog = new JFrame(); - dialog.getContentPane().add(new ComponentPresetEditor(dialog)); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.pack(); - dialog.setVisible(true); - } - }); - menu.add(item); - } - + + if (System.getProperty("openrocket.preseteditor.menu") != null) { + item = new JMenuItem(trans.get("main.menu.edit.editpreset")); + item.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + JFrame dialog = new JFrame(); + dialog.getContentPane().add(new ComponentPresetEditor(dialog)); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.pack(); + dialog.setVisible(true); + } + }); + menu.add(item); + } + //// Analyze menu = new JMenu(trans.get("main.menu.analyze")); menu.setMnemonic(KeyEvent.VK_A); //// Analyzing the rocket menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.desc")); menubar.add(menu); - + //// Component analysis item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C); //// Analyze the rocket components separately @@ -653,7 +653,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Optimize item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); @@ -665,7 +665,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Custom expressions item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E); item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.customExpressions.desc")); @@ -677,25 +677,25 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Debug // (shown if openrocket.debug.menu is defined) if (System.getProperty("openrocket.debug.menu") != null) { menubar.add(makeDebugMenu()); } - - - + + + //// Help - + menu = new JMenu(trans.get("main.menu.help")); menu.setMnemonic(KeyEvent.VK_H); menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.desc")); menubar.add(menu); - - + + // Guided tours - + item = new JMenuItem(trans.get("main.menu.help.tours"), KeyEvent.VK_L); item.setIcon(Icons.HELP_TOURS); item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.help.tours.desc")); @@ -707,9 +707,9 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + menu.addSeparator(); - + //// Bug report item = new JMenuItem(trans.get("main.menu.help.bugReport"), KeyEvent.VK_B); item.setIcon(Icons.HELP_BUG_REPORT); @@ -722,7 +722,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + //// Debug log item = new JMenuItem(trans.get("main.menu.help.debugLog")); item.setIcon(Icons.HELP_DEBUG_LOG); @@ -735,10 +735,10 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + menu.addSeparator(); - - + + //// License item = new JMenuItem(trans.get("main.menu.help.license"), KeyEvent.VK_L); item.setIcon(Icons.HELP_LICENSE); @@ -751,8 +751,8 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - + + //// About item = new JMenuItem(trans.get("main.menu.help.about"), KeyEvent.VK_A); item.setIcon(Icons.HELP_ABOUT); @@ -765,24 +765,24 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - + + this.setJMenuBar(menubar); } - + private JMenu makeDebugMenu() { JMenu menu; JMenuItem item; - + /* * This menu is intentionally left untranslated. */ - + //// Debug menu menu = new JMenu("Debug"); //// OpenRocket debugging tasks menu.getAccessibleContext().setAccessibleDescription("OpenRocket debugging tasks"); - + //// What is this menu? item = new JMenuItem("What is this menu?"); item.addActionListener(new ActionListener() { @@ -800,9 +800,9 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + menu.addSeparator(); - + //// Create test rocket item = new JMenuItem("Create test rocket"); item.addActionListener(new ActionListener() { @@ -817,7 +817,7 @@ public class BasicFrame extends JFrame { JOptionPane.QUESTION_MESSAGE, null, new Object[] { "Random", "OK" }, "OK"); - + Rocket r; if (sel == 0) { r = new TestRockets(null).makeTestRocket(); @@ -826,7 +826,7 @@ public class BasicFrame extends JFrame { } else { return; } - + OpenRocketDocument doc = new OpenRocketDocument(r); doc.setSaved(true); BasicFrame frame = new BasicFrame(doc); @@ -834,9 +834,9 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - - + + + item = new JMenuItem("Create 'Iso-Haisu'"); item.addActionListener(new ActionListener() { @Override @@ -850,8 +850,8 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - + + item = new JMenuItem("Create 'Big Blue'"); item.addActionListener(new ActionListener() { @Override @@ -865,16 +865,16 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + menu.addSeparator(); - - + + item = new JMenuItem("Memory statistics"); item.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { log.user("Memory statistics selected"); - + // Get discarded but remaining objects (this also runs System.gc multiple times) List objects = MemoryManagement.getRemainingCollectableObjects(); StringBuilder sb = new StringBuilder(); @@ -891,7 +891,7 @@ public class BasicFrame extends JFrame { o = null; } sb.append("Total: " + count); - + // Get basic memory stats System.gc(); long max = Runtime.getRuntime().maxMemory(); @@ -902,14 +902,14 @@ public class BasicFrame extends JFrame { stats[1] = String.format(" Max memory: %.1f MB", max / 1024.0 / 1024.0); stats[2] = String.format(" Used memory: %.1f MB (%.0f%%)", used / 1024.0 / 1024.0, 100.0 * used / max); stats[3] = String.format(" Free memory: %.1f MB (%.0f%%)", free / 1024.0 / 1024.0, 100.0 * free / max); - - + + DetailDialog.showDetailedMessageDialog(BasicFrame.this, stats, sb.toString(), "Memory statistics", JOptionPane.INFORMATION_MESSAGE); } }); menu.add(item); - + //// Exhaust memory item = new JMenuItem("Exhaust memory"); item.addActionListener(new ActionListener() { @@ -939,10 +939,10 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - + + menu.addSeparator(); - + //// Exception here item = new JMenuItem("Exception here"); item.addActionListener(new ActionListener() { @@ -953,7 +953,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + item = new JMenuItem("Exception from EDT"); item.addActionListener(new ActionListener() { @Override @@ -969,7 +969,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + item = new JMenuItem("Exception from other thread"); item.addActionListener(new ActionListener() { @Override @@ -984,7 +984,7 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - + item = new JMenuItem("OutOfMemoryError here"); item.addActionListener(new ActionListener() { @Override @@ -994,11 +994,11 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - + + menu.addSeparator(); - - + + item = new JMenuItem("Test popup"); item.addActionListener(new ActionListener() { @Override @@ -1014,14 +1014,14 @@ public class BasicFrame extends JFrame { } }); menu.add(item); - - - - + + + + return menu; } - - + + /** * Select the tab on the main pane. * @@ -1030,17 +1030,17 @@ public class BasicFrame extends JFrame { public void selectTab(int tab) { tabbedPane.setSelectedIndex(tab); } - - - + + + private void openAction() { JFileChooser chooser = new JFileChooser(); - + chooser.addChoosableFileFilter(FileHelper.ALL_DESIGNS_FILTER); chooser.addChoosableFileFilter(FileHelper.OPENROCKET_DESIGN_FILTER); chooser.addChoosableFileFilter(FileHelper.ROCKSIM_DESIGN_FILTER); chooser.setFileFilter(FileHelper.ALL_DESIGNS_FILTER); - + chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); chooser.setMultiSelectionEnabled(true); chooser.setCurrentDirectory(((SwingPreferences) Application.getPreferences()).getDefaultDirectory()); @@ -1049,33 +1049,34 @@ public class BasicFrame extends JFrame { log.user("Decided not to open files, option=" + option); return; } - + ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory()); - + File[] files = chooser.getSelectedFiles(); log.user("Opening files " + Arrays.toString(files)); - + for (File file : files) { log.info("Opening file: " + file); if (open(file, this)) { - MRUDesignFile opts = MRUDesignFile.getInstance(); - opts.addFile(file.getAbsolutePath()); + MRUDesignFile opts = MRUDesignFile.getInstance(); + opts.addFile(file.getAbsolutePath()); } } } - + void closeIfReplaceable() { // Close previous window if replacing if (replaceable && document.isSaved()) { // We are replacing the frame, make new window have current location BasicFrame newFrame = frames.get(frames.size() - 1); newFrame.setLocation(this.getLocation()); - + log.info("Closing window because it is replaceable"); closeAction(); } - + } + /** * Open a file based on a URL. * @param url the file to open. @@ -1084,16 +1085,16 @@ public class BasicFrame extends JFrame { */ private static boolean open(URL url, BasicFrame parent) { String filename = null; - + // First figure out the file name from the URL - + // Try using URI.getPath(); try { URI uri = url.toURI(); filename = uri.getPath(); } catch (URISyntaxException ignore) { } - + // Try URL-decoding the URL if (filename == null) { try { @@ -1101,18 +1102,18 @@ public class BasicFrame extends JFrame { } catch (UnsupportedEncodingException ignore) { } } - + // Last resort if (filename == null) { filename = ""; } - + // Remove path from filename if (filename.lastIndexOf('/') >= 0) { filename = filename.substring(filename.lastIndexOf('/') + 1); } - - + + // Open the file log.info("Opening file from url=" + url + " filename=" + filename); try { @@ -1124,11 +1125,11 @@ public class BasicFrame extends JFrame { "An error occurred while opening the file " + filename, "Error loading file", JOptionPane.ERROR_MESSAGE); } - + return false; } - - + + /** * Open the specified file from an InputStream in a new design frame. If an error * occurs, an error dialog is shown and false is returned. @@ -1142,8 +1143,8 @@ public class BasicFrame extends JFrame { OpenFileWorker worker = new OpenFileWorker(stream, ROCKET_LOADER); return open(worker, filename, null, parent); } - - + + /** * Open the specified file in a new design frame. If an error occurs, an error * dialog is shown and false is returned. @@ -1156,8 +1157,8 @@ public class BasicFrame extends JFrame { OpenFileWorker worker = new OpenFileWorker(file, ROCKET_LOADER); return open(worker, file.getName(), file, parent); } - - + + /** * Open the specified file using the provided worker. * @@ -1168,9 +1169,7 @@ public class BasicFrame extends JFrame { * @return */ private static boolean open(OpenFileWorker worker, String filename, File file, Window parent) { - - MotorDatabaseLoadingDialog.check(parent); - + // Open the file in a Swing worker thread log.info("Starting OpenFileWorker"); if (!SwingWorkerDialog.runWorker(parent, "Opening file", "Reading " + filename + "...", worker)) { @@ -1178,50 +1177,50 @@ public class BasicFrame extends JFrame { log.info("User cancelled the OpenFileWorker"); return false; } - - + + // Handle the document OpenRocketDocument doc = null; try { - + doc = worker.get(); - + } catch (ExecutionException e) { - + Throwable cause = e.getCause(); - + if (cause instanceof FileNotFoundException) { - + log.warn("File not found", cause); JOptionPane.showMessageDialog(parent, "File not found: " + filename, "Error opening file", JOptionPane.ERROR_MESSAGE); return false; - + } else if (cause instanceof RocketLoadException) { - + log.warn("Error loading the file", cause); JOptionPane.showMessageDialog(parent, "Unable to open file '" + filename + "': " + cause.getMessage(), "Error opening file", JOptionPane.ERROR_MESSAGE); return false; - + } else { - + throw new BugException("Unknown error when opening file", e); - + } - + } catch (InterruptedException e) { throw new BugException("EDT was interrupted", e); } - + if (doc == null) { throw new BugException("Document loader returned null"); } - - + + // Show warnings WarningSet warnings = worker.getRocketLoader().getWarnings(); if (!warnings.isEmpty()) { @@ -1236,24 +1235,24 @@ public class BasicFrame extends JFrame { //// Warnings while opening file trans.get("BasicFrame.WarningDialog.title"), warnings); } - - + + // Set document state doc.setFile(file); doc.setSaved(true); - - + + // Open the frame log.debug("Opening new frame with the document"); BasicFrame frame = new BasicFrame(doc); frame.setVisible(true); - - if ( parent != null && parent instanceof BasicFrame ) { - ((BasicFrame)parent).closeIfReplaceable(); + + if (parent != null && parent instanceof BasicFrame) { + ((BasicFrame) parent).closeIfReplaceable(); } return true; } - + /** * "Save" action. If the design is new, then this is identical to "Save As", with a default file filter for .ork. * If the rocket being edited previously was opened from a .ork file, then it will be saved immediately to the same @@ -1269,13 +1268,13 @@ public class BasicFrame extends JFrame { return saveAsAction(); } log.info("Saving document to " + file); - + if (FileHelper.ROCKSIM_DESIGN_FILTER.accept(file)) { return saveAsRocksim(file); } return saveAs(file); } - + /** * "Save As" action. * @@ -1290,13 +1289,13 @@ public class BasicFrame extends JFrame { */ private boolean saveAsAction() { File file = null; - + StorageOptionChooser storageChooser = new StorageOptionChooser(document, document.getDefaultStorageOptions()); final JFileChooser chooser = new JFileChooser(); chooser.addChoosableFileFilter(FileHelper.OPENROCKET_DESIGN_FILTER); chooser.addChoosableFileFilter(FileHelper.ROCKSIM_DESIGN_FILTER); - + //Force the file filter to match the file extension that was opened. Will default to OR if the file is null. if (FileHelper.ROCKSIM_DESIGN_FILTER.accept(document.getFile())) { chooser.setFileFilter(FileHelper.ROCKSIM_DESIGN_FILTER); @@ -1309,22 +1308,22 @@ public class BasicFrame extends JFrame { if (document.getFile() != null) { chooser.setSelectedFile(document.getFile()); } - + int option = chooser.showSaveDialog(BasicFrame.this); if (option != JFileChooser.APPROVE_OPTION) { log.user("User decided not to save, option=" + option); return false; } - + file = chooser.getSelectedFile(); if (file == null) { log.user("User did not select a file"); return false; } - + ((SwingPreferences) Application.getPreferences()).setDefaultDirectory(chooser.getCurrentDirectory()); storageChooser.storeOptions(document.getDefaultStorageOptions()); - + if (chooser.getFileFilter().equals(FileHelper.ROCKSIM_DESIGN_FILTER)) { return saveAsRocksim(file); } @@ -1333,7 +1332,7 @@ public class BasicFrame extends JFrame { return FileHelper.confirmWrite(file, this) && saveAs(file); } } - + /** * Perform the writing of the design to the given file in Rocksim format. * @@ -1346,7 +1345,7 @@ public class BasicFrame extends JFrame { if (!FileHelper.confirmWrite(file, this)) { return false; } - + try { new RocksimSaver().save(file, document); return true; @@ -1354,7 +1353,7 @@ public class BasicFrame extends JFrame { return false; } } - + /** * Perform the writing of the design to the given file in OpenRocket format. * @@ -1365,25 +1364,25 @@ public class BasicFrame extends JFrame { private boolean saveAs(File file) { log.info("Saving document as " + file); boolean saved = false; - + if (!StorageOptionChooser.verifyStorageOptions(document, this)) { // User cancelled the dialog log.user("User cancelled saving in storage options dialog"); return false; } - - + + SaveFileWorker worker = new SaveFileWorker(document, file, ROCKET_SAVER); - + if (!SwingWorkerDialog.runWorker(this, "Saving file", "Writing " + file.getName() + "...", worker)) { - + // User cancelled the save log.user("User cancelled the save, deleting the file"); file.delete(); return false; } - + try { worker.get(); document.setFile(file); @@ -1391,9 +1390,9 @@ public class BasicFrame extends JFrame { saved = true; setTitle(); } catch (ExecutionException e) { - + Throwable cause = e.getCause(); - + if (cause instanceof IOException) { log.warn("An I/O error occurred while saving " + file, cause); JOptionPane.showMessageDialog(this, new String[] { @@ -1403,15 +1402,15 @@ public class BasicFrame extends JFrame { } else { Reflection.handleWrappedException(e); } - + } catch (InterruptedException e) { throw new BugException("EDT was interrupted", e); } - + return saved; } - - + + private boolean closeAction() { if (!document.isSaved()) { log.info("Confirming whether to save the design"); @@ -1438,14 +1437,14 @@ public class BasicFrame extends JFrame { return false; } } - + // Rocket has been saved or discarded log.debug("Disposing window"); this.dispose(); - + ComponentConfigDialog.hideDialog(); ComponentAnalysisDialog.hideDialog(); - + frames.remove(this); if (frames.isEmpty()) { log.info("Last frame closed, exiting"); @@ -1453,26 +1452,26 @@ public class BasicFrame extends JFrame { } return true; } - - - + + + /** * */ public void printAction() { - Double rotation = rocketpanel.getFigure().getRotation(); - if (rotation == null) { - rotation = 0d; - } + Double rotation = rocketpanel.getFigure().getRotation(); + if (rotation == null) { + rotation = 0d; + } new PrintDialog(this, document, rotation).setVisible(true); } - + /** * Open a new design window with a basic rocket+stage. */ public static void newAction() { log.info("New action initiated"); - + Rocket rocket = new Rocket(); Stage stage = new Stage(); //// Sustainer @@ -1480,14 +1479,14 @@ public class BasicFrame extends JFrame { rocket.addChild(stage); OpenRocketDocument doc = new OpenRocketDocument(rocket); doc.setSaved(true); - + BasicFrame frame = new BasicFrame(doc); frame.replaceable = true; frame.setVisible(true); // kruland commented this out - I don't like it. //ComponentConfigDialog.showDialog(frame, doc, rocket); } - + /** * Quit the application. Confirms saving unsaved designs. The action of File->Quit. */ @@ -1505,8 +1504,8 @@ public class BasicFrame extends JFrame { log.error("Should already have exited application"); System.exit(0); } - - + + /** * Set the title of the frame, taking into account the name of the rocket, file it * has been saved to (if any) and saved status. @@ -1515,19 +1514,19 @@ public class BasicFrame extends JFrame { File file = document.getFile(); boolean saved = document.isSaved(); String title; - + title = rocket.getName(); if (file != null) { title = title + " (" + file.getName() + ")"; } if (!saved) title = "*" + title; - + setTitle(title); } - - - + + + /** * Find a currently open BasicFrame containing the specified rocket. This method * can be used to map a Rocket to a BasicFrame from GUI methods. @@ -1545,7 +1544,7 @@ public class BasicFrame extends JFrame { log.debug("Could not find frame for rocket " + rocket); return null; } - + /** * Find a currently open document by the rocket object. This method can be used * to map a Rocket to OpenRocketDocument from GUI methods. diff --git a/core/src/net/sf/openrocket/gui/util/BlockingMotorDatabaseProvider.java b/core/src/net/sf/openrocket/gui/util/BlockingMotorDatabaseProvider.java new file mode 100644 index 000000000..f3961a8d4 --- /dev/null +++ b/core/src/net/sf/openrocket/gui/util/BlockingMotorDatabaseProvider.java @@ -0,0 +1,115 @@ +package net.sf.openrocket.gui.util; + +import java.awt.SplashScreen; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.Timer; + +import net.miginfocom.swing.MigLayout; +import net.sf.openrocket.database.motor.ThrustCurveMotorSetDatabase; +import net.sf.openrocket.gui.main.Splash; +import net.sf.openrocket.l10n.Translator; +import net.sf.openrocket.logging.LogHelper; +import net.sf.openrocket.startup.MotorDatabaseLoader; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +/** + * A motor database that waits until the db has loaded in the background before + * returning it. If appropriate, it displays a modal dialog while loading. + *

+ * This class dual-functions as a MotorDatabase and a Guice Provider for the same. + * + * @author Sampo Niskanen + */ +public class BlockingMotorDatabaseProvider implements Provider { + @Inject + private LogHelper log; + @Inject + private Translator trans; + + private final MotorDatabaseLoader loader; + + public BlockingMotorDatabaseProvider(MotorDatabaseLoader loader) { + this.loader = loader; + } + + + @Override + public ThrustCurveMotorSetDatabase get() { + check(); + return loader.getDatabase(); + } + + + + + private void check() { + if (loader.isLoaded()) { + return; + } + + SplashScreen splash = Splash.getSplashScreen(); + if (splash == null || !splash.isVisible()) { + + log.info(1, "Motor database not loaded yet, displaying dialog"); + + final LoadingDialog dialog = new LoadingDialog(); + + Timer timer = new Timer(100, new ActionListener() { + private int count = 0; + + @Override + public void actionPerformed(ActionEvent e) { + count++; + if (loader.isLoaded()) { + log.debug("Database loaded, closing dialog"); + dialog.setVisible(false); + } else if (count % 10 == 0) { + log.debug("Database not loaded, count=" + count); + } + } + }); + + loader.cancelStartupDelay(); + timer.start(); + dialog.setVisible(true); + timer.stop(); + + } else { + + log.info(1, "Motor database not loaded yet, splash screen still present, delaying until loaded"); + loader.blockUntilLoaded(); + + } + + log.info("Motor database now loaded"); + } + + + private class LoadingDialog extends JDialog { + private LoadingDialog() { + super(null, trans.get("MotorDbLoadDlg.title"), ModalityType.APPLICATION_MODAL); + + JPanel panel = new JPanel(new MigLayout("fill")); + panel.add(new JLabel(trans.get("MotorDbLoadDlg.Loadingmotors")), "wrap para"); + + JProgressBar progress = new JProgressBar(); + progress.setIndeterminate(true); + panel.add(progress, "growx"); + + this.add(panel); + this.pack(); + this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + this.setLocationByPlatform(true); + GUIUtil.setWindowIcons(this); + } + } + +} diff --git a/core/src/net/sf/openrocket/startup/Application.java b/core/src/net/sf/openrocket/startup/Application.java index 3e89b419d..c4b206567 100644 --- a/core/src/net/sf/openrocket/startup/Application.java +++ b/core/src/net/sf/openrocket/startup/Application.java @@ -1,7 +1,8 @@ package net.sf.openrocket.startup; import net.sf.openrocket.database.ComponentPresetDao; -import net.sf.openrocket.database.MotorDatabase; +import net.sf.openrocket.database.motor.MotorDatabase; +import net.sf.openrocket.database.motor.ThrustCurveMotorSetDatabase; import net.sf.openrocket.l10n.ClassBasedTranslator; import net.sf.openrocket.l10n.DebugTranslator; import net.sf.openrocket.l10n.ExceptionSuppressingTranslator; @@ -25,8 +26,6 @@ public final class Application { private static Translator baseTranslator = new DebugTranslator(null); - private static MotorDatabase motorSetDatabase; - private static ComponentPresetDao componentPresetDao; private static Preferences preferences; @@ -155,18 +154,25 @@ public final class Application { /** * Return the database of all thrust curves loaded into the system. + * + * @deprecated Fetch the db from Guice instead. */ + @Deprecated public static MotorDatabase getMotorSetDatabase() { - return motorSetDatabase; + return injector.getInstance(MotorDatabase.class); } /** - * Set the database of thrust curves loaded into the system. + * Return the ThrustCurveMotorSetDatabase for the system. + * + * @deprecated Fetch the db from Guice instead. */ - public static void setMotorSetDatabase(MotorDatabase motorSetDatabase) { - Application.motorSetDatabase = motorSetDatabase; + @Deprecated + public static ThrustCurveMotorSetDatabase getThrustCurveMotorSetDatabase() { + return injector.getInstance(ThrustCurveMotorSetDatabase.class); } + public static ComponentPresetDao getComponentPresetDao() { return componentPresetDao; diff --git a/core/src/net/sf/openrocket/startup/ApplicationModule.java b/core/src/net/sf/openrocket/startup/ApplicationModule.java index 51b40f27b..32d35290f 100644 --- a/core/src/net/sf/openrocket/startup/ApplicationModule.java +++ b/core/src/net/sf/openrocket/startup/ApplicationModule.java @@ -1,5 +1,6 @@ package net.sf.openrocket.startup; +import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import com.google.inject.AbstractModule; @@ -10,6 +11,7 @@ public class ApplicationModule extends AbstractModule { protected void configure() { bind(LogHelper.class).toInstance(Application.getLogger()); bind(Preferences.class).toInstance(Application.getPreferences()); + bind(Translator.class).toInstance(Application.getTranslator()); } } diff --git a/core/src/net/sf/openrocket/startup/ApplicationModule2.java b/core/src/net/sf/openrocket/startup/ApplicationModule2.java new file mode 100644 index 000000000..c86f54d31 --- /dev/null +++ b/core/src/net/sf/openrocket/startup/ApplicationModule2.java @@ -0,0 +1,25 @@ +package net.sf.openrocket.startup; + +import net.sf.openrocket.database.motor.MotorDatabase; +import net.sf.openrocket.database.motor.ThrustCurveMotorSetDatabase; + +import com.google.inject.AbstractModule; +import com.google.inject.Provider; + +public class ApplicationModule2 extends AbstractModule { + + private final Provider motorDatabaseProvider; + + + public ApplicationModule2(Provider motorDatabaseProvider) { + this.motorDatabaseProvider = motorDatabaseProvider; + } + + + @Override + protected void configure() { + bind(ThrustCurveMotorSetDatabase.class).toProvider(motorDatabaseProvider); + bind(MotorDatabase.class).toProvider(motorDatabaseProvider); + } + +} diff --git a/core/src/net/sf/openrocket/startup/ApplicationStartup.java b/core/src/net/sf/openrocket/startup/ApplicationStartup.java index 480c67d1d..31b6b9acb 100644 --- a/core/src/net/sf/openrocket/startup/ApplicationStartup.java +++ b/core/src/net/sf/openrocket/startup/ApplicationStartup.java @@ -21,6 +21,7 @@ import net.sf.openrocket.gui.main.MRUDesignFile; import net.sf.openrocket.gui.main.Splash; import net.sf.openrocket.gui.main.SwingExceptionHandler; import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.BlockingMotorDatabaseProvider; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.util.BuildProperties; @@ -31,6 +32,10 @@ import com.google.inject.Injector; /** * The second class in the OpenRocket startup sequence. This class can assume the * Application class to be properly set up, and can use any classes safely. + *

+ * This class needs to complete the application setup, create a child Injector that + * contains all necessary bindings for the system, replace the Injector in Application + * and then continue the startup. * * @author Sampo Niskanen */ @@ -42,8 +47,6 @@ public class ApplicationStartup { private Injector injector; - private static final String THRUSTCURVE_DIRECTORY = "datafiles/thrustcurves/"; - /** * Run when starting up OpenRocket after Application has been set up. * @@ -123,7 +126,13 @@ public class ApplicationStartup { // Load motors etc. log.info("Loading databases"); loadPresetComponents(); - loadMotor(); + BlockingMotorDatabaseProvider db = loadMotor(); + + // Update injector to contain database bindings + ApplicationModule2 module = new ApplicationModule2(db); + Injector injector2 = injector.createChildInjector(module); + Application.setInjector(injector2); + Databases.fakeMethod(); @@ -183,11 +192,14 @@ public class ApplicationStartup { * Start loading motors in background thread. * * Public for Python bindings. + * + * @return a provider for the database which blocks before returning the db. */ - public void loadMotor() { - ConcurrentLoadingThrustCurveMotorSetDatabase motorLoader = new ConcurrentLoadingThrustCurveMotorSetDatabase(THRUSTCURVE_DIRECTORY); - motorLoader.startLoading(); - Application.setMotorSetDatabase(motorLoader); + public BlockingMotorDatabaseProvider loadMotor() { + MotorDatabaseLoader bg = injector.getInstance(MotorDatabaseLoader.class); + bg.startLoading(); + BlockingMotorDatabaseProvider db = new BlockingMotorDatabaseProvider(bg); + return db; } /** diff --git a/core/src/net/sf/openrocket/startup/ConcurrentLoadingThrustCurveMotorSetDatabase.java b/core/src/net/sf/openrocket/startup/ConcurrentLoadingThrustCurveMotorSetDatabase.java deleted file mode 100644 index 1e2f0a7b3..000000000 --- a/core/src/net/sf/openrocket/startup/ConcurrentLoadingThrustCurveMotorSetDatabase.java +++ /dev/null @@ -1,452 +0,0 @@ -package net.sf.openrocket.startup; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import net.sf.openrocket.database.ThrustCurveMotorSet; -import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; -import net.sf.openrocket.file.iterator.DirectoryIterator; -import net.sf.openrocket.file.iterator.FileIterator; -import net.sf.openrocket.file.motor.GeneralMotorLoader; -import net.sf.openrocket.file.motor.MotorLoaderHelper; -import net.sf.openrocket.gui.util.SimpleFileFilter; -import net.sf.openrocket.gui.util.SwingPreferences; -import net.sf.openrocket.logging.LogHelper; -import net.sf.openrocket.motor.Motor; -import net.sf.openrocket.motor.ThrustCurveMotor; -import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.Pair; - -/** - * Load motors in parallel using a three stage pipeline. - * - * Stage 1: single thread managed by the ThrustCurveMotorSetDatabase. This thread generates - * one object for each thrust curve motor file and puts it in the second stage. - * - * Stage 2: multiple threads which process individual files. Each process takes - * a single motor file and parses out the list of motors it contains. - * The list of motors is queued up for the third stage to process. - * - * Stage 3: single thread which processes the list of motors generated in stage 2. - * This thread puts all the motors from the list in the motor set database. - * - * It is important that stage 3 be done with a single thread because ThrustCurveMotorSetDatabase - * is not thread safe. Even if synchronization were to be done, it is unlikely that parallelizing - * this process would improve anything. - * - * - */ -public class ConcurrentLoadingThrustCurveMotorSetDatabase extends ThrustCurveMotorSetDatabase { - - private static final int MAX_LOADING_THREADS = 10; - - private static final LogHelper log = Application.getLogger(); - private final String thrustCurveDirectory; - - /** Block motor loading for this many milliseconds */ - // Block motor loading for 1.5 seconds to allow window painting to be faster - private static AtomicInteger blockLoading = new AtomicInteger(1500); - - private int motorCount = 0; - - public ConcurrentLoadingThrustCurveMotorSetDatabase(String thrustCurveDirectory) { - super(true); - this.thrustCurveDirectory = thrustCurveDirectory; - } - - @Override - protected void loadMotors() { - - // Block loading until timeout occurs or database is taken into use - log.info("Blocking motor loading while starting up"); - - while (!inUse && blockLoading.addAndGet(-100) > 0) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - } - } - - log.info("Blocking ended, inUse=" + inUse + " blockLoading=" + blockLoading.get()); - - if (true) { - GeneralMotorLoader loader = new GeneralMotorLoader(); - SimpleFileFilter fileFilter = new SimpleFileFilter("", loader.getSupportedExtensions()); - - log.info("Starting reading serialized motor database"); - FileIterator iterator = DirectoryIterator.findDirectory(thrustCurveDirectory, new SimpleFileFilter("", false, "ser")); - while (iterator.hasNext()) { - Pair f = iterator.next(); - loadSerialized(f); - } - log.info("Ending reading serialized motor database, motorCount=" + motorCount); - - - log.info("Starting reading user-defined motors"); - for (File file : ((SwingPreferences) Application.getPreferences()).getUserThrustCurveFiles()) { - if (file.isFile()) { - loadFile(loader, file); - } else if (file.isDirectory()) { - loadDirectory(loader, fileFilter, file); - } else { - log.warn("User-defined motor file " + file + " is neither file nor directory"); - } - } - log.info("Ending reading user-defined motors, motorCount=" + motorCount); - - } else { - BookKeeping keeper = new BookKeeping(); - keeper.start(); - - try { - keeper.waitForFinish(); - } catch (InterruptedException iex) { - throw new BugException(iex); - } - - keeper = null; - } - } - - - private void loadSerialized(Pair f) { - try { - log.debug("Reading motors from file " + f.getU()); - ObjectInputStream ois = new ObjectInputStream(f.getV()); - List motors = (List) ois.readObject(); - addMotors(motors); - } catch (Exception ex) { - throw new BugException(ex); - } - } - - - private void loadFile(GeneralMotorLoader loader, File file) { - BufferedInputStream bis = null; - try { - log.debug("Loading motors from file " + file); - bis = new BufferedInputStream(new FileInputStream(file)); - List motors = loader.load(bis, file.getName()); - addMotors(motors); - bis.close(); - } catch (IOException e) { - log.warn("IOException while reading " + file + ": " + e, e); - if (bis != null) { - try { - bis.close(); - } catch (IOException e1) { - - } - } - } - } - - private void loadDirectory(GeneralMotorLoader loader, SimpleFileFilter fileFilter, File file) { - FileIterator iterator; - try { - iterator = new DirectoryIterator(file, fileFilter, true); - } catch (IOException e) { - log.warn("Unable to read directory " + file + ": " + e, e); - return; - } - while (iterator.hasNext()) { - Pair f = iterator.next(); - try { - List motors = loader.load(f.getV(), f.getU()); - addMotors(motors); - f.getV().close(); - } catch (IOException e) { - log.warn("IOException while loading file " + f.getU() + ": " + e, e); - try { - f.getV().close(); - } catch (IOException e1) { - } - } - } - } - - private synchronized void addMotors(List motors) { - for (Motor m : motors) { - motorCount++; - addMotor((ThrustCurveMotor) m); - } - } - - /** - * A class which holds all the threading data. - * Implemented as an inner class so we can easily jettison the references when - * the processing is terminated. - * - */ - private class BookKeeping { - - /* - * Executor for Stage 3. - */ - private final ExecutorService writerThread; - - /* - * Executor for Stage 2. - */ - private final ExecutorService loaderPool; - - /* - * Runnable used for Stage 1. - */ - private final WorkGenerator workGenerator; - - private long startTime; - - /* - * Number of thrust curves loaded - */ - private int thrustCurveCount = 0; - - /* - * Number of files processed. - */ - private int fileCount = 0; - - /* - * We have to hold on to the zip file iterator which is used to load - * the system motor files until all processing is done. This is because - * closing the iterator prematurely causes all the InputStreams opened - * with it to close. - */ - private FileIterator iterator; - - private BookKeeping() { - - writerThread = new ThreadPoolExecutor(1, 1, 200, TimeUnit.SECONDS, - new LinkedBlockingQueue(), - new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r, "MotorWriterThread"); - return t; - } - }); - - loaderPool = new ThreadPoolExecutor(10, 10, 2, TimeUnit.SECONDS, - new LinkedBlockingQueue(), - new ThreadFactory() { - int threadCount = 0; - - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r, "MotorLoaderPool-" + threadCount++); - return t; - } - }); - - workGenerator = new WorkGenerator(); - - } - - private void start() { - - startTime = System.currentTimeMillis(); - - log.info("Starting motor loading from " + thrustCurveDirectory + " in background thread."); - - // Run the work generator - in this thread. - workGenerator.run(); - - } - - private void waitForFinish() throws InterruptedException { - try { - loaderPool.shutdown(); - loaderPool.awaitTermination(90, TimeUnit.SECONDS); - writerThread.shutdown(); - writerThread.awaitTermination(90, TimeUnit.SECONDS); - } finally { - iterator.close(); - } - - long endTime = System.currentTimeMillis(); - - int distinctMotorCount = 0; - int distinctThrustCurveCount = 0; - distinctMotorCount = motorSets.size(); - for (ThrustCurveMotorSet set : motorSets) { - distinctThrustCurveCount += set.getMotorCount(); - } - - log.info("Motor loading done, took " + (endTime - startTime) + " ms to load " - + fileCount + " files/directories containing " - + thrustCurveCount + " thrust curves which contained " - + distinctMotorCount + " distinct motors with " - + distinctThrustCurveCount + " distinct thrust curves."); - - } - - - private class WorkGenerator implements Runnable { - - @Override - public void run() { - // Start loading - log.info("Loading motors from " + thrustCurveDirectory); - - iterator = DirectoryIterator.findDirectory(thrustCurveDirectory, new SimpleFileFilter("", false, "ser")); - - // Load the packaged thrust curves - if (iterator == null) { - throw new IllegalStateException("Thrust curve directory " + thrustCurveDirectory + - "not found, distribution built wrong"); - } - - while (iterator.hasNext()) { - Pair f = iterator.next(); - try { - log.debug("Start reading motors from file " + f.getU()); - ObjectInputStream ois = new ObjectInputStream(f.getV()); - List m = (List) ois.readObject(); - writerThread.submit(new MotorInserter(m)); - log.debug("Stop reading motors from file " + f.getU()); - } catch (Exception ex) { - throw new BugException(ex); - } - } - - // Load the user-defined thrust curves - for (File file : ((SwingPreferences) Application.getPreferences()).getUserThrustCurveFiles()) { - if (file == null) { - continue; - } - log.info("Loading motors from " + file); - BackgroundMotorLoader loader = new BackgroundMotorLoader(file); - loaderPool.execute(loader); - fileCount++; - } - } - } - - private class BackgroundMotorLoader implements Runnable { - - private final InputStream is; - private final String fileName; - - private final File file; - - public BackgroundMotorLoader(File file) { - super(); - this.file = file; - this.is = null; - this.fileName = null; - } - - public BackgroundMotorLoader(InputStream is, String fileName) { - super(); - this.file = null; - this.is = is; - this.fileName = fileName; - } - - @Override - public void run() { - if (fileName != null) { - log.debug("Loading motor from " + fileName); - } - - try { - List motors; - if (file == null) { - motors = MotorLoaderHelper.load(is, fileName); - } else { - motors = MotorLoaderHelper.load(file); - } - writerThread.submit(new MotorInserter(motors)); - } finally { - if (is != null) { - try { - is.close(); - } catch (IOException iex) { - } - } - } - } - } - - private class MotorInserter implements Runnable { - - private final List motors; - - MotorInserter(Motor motor) { - this.motors = Collections.singletonList(motor); - } - - MotorInserter(List motors) { - this.motors = motors; - } - - @Override - public void run() { - thrustCurveCount += motors.size(); - ConcurrentLoadingThrustCurveMotorSetDatabase.this.addMotors(motors); - } - - } - } - - - private class BackgroundMotorLoader implements Runnable { - - private final InputStream is; - private final String fileName; - - private final File file; - - public BackgroundMotorLoader(File file) { - super(); - this.file = file; - this.is = null; - this.fileName = null; - } - - public BackgroundMotorLoader(InputStream is, String fileName) { - super(); - this.file = null; - this.is = is; - this.fileName = fileName; - } - - @Override - public void run() { - if (fileName != null) { - log.debug("Loading motor from " + fileName); - } - - try { - List motors; - if (file == null) { - motors = MotorLoaderHelper.load(is, fileName); - } else { - motors = MotorLoaderHelper.load(file); - } - addMotors(motors); - } finally { - if (is != null) { - try { - is.close(); - } catch (IOException iex) { - } - } - } - } - } - -} diff --git a/core/src/net/sf/openrocket/startup/MotorDatabaseLoader.java b/core/src/net/sf/openrocket/startup/MotorDatabaseLoader.java new file mode 100644 index 000000000..6999c1019 --- /dev/null +++ b/core/src/net/sf/openrocket/startup/MotorDatabaseLoader.java @@ -0,0 +1,154 @@ +package net.sf.openrocket.startup; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.util.List; + +import net.sf.openrocket.database.AsynchronousDatabaseLoader; +import net.sf.openrocket.database.motor.ThrustCurveMotorSetDatabase; +import net.sf.openrocket.file.iterator.DirectoryIterator; +import net.sf.openrocket.file.iterator.FileIterator; +import net.sf.openrocket.file.motor.GeneralMotorLoader; +import net.sf.openrocket.gui.util.SimpleFileFilter; +import net.sf.openrocket.gui.util.SwingPreferences; +import net.sf.openrocket.logging.LogHelper; +import net.sf.openrocket.motor.Motor; +import net.sf.openrocket.motor.ThrustCurveMotor; +import net.sf.openrocket.util.BugException; +import net.sf.openrocket.util.Pair; + +import com.google.inject.Inject; + +/** + * An asynchronous database loader that loads the internal thrust curves + * and external user-supplied thrust curves to a ThrustCurveMotorSetDatabase. + * The resulting database is obtained using getDatabase(). + * + * @author Sampo Niskanen + */ +public class MotorDatabaseLoader extends AsynchronousDatabaseLoader { + private static final String THRUSTCURVE_DIRECTORY = "datafiles/thrustcurves/"; + private static final long STARTUP_DELAY = 0; + + @Inject + private LogHelper log; + + private final ThrustCurveMotorSetDatabase database = new ThrustCurveMotorSetDatabase(); + private int motorCount = 0; + + + public MotorDatabaseLoader() { + super(STARTUP_DELAY); + } + + + @Override + protected void loadDatabase() { + + GeneralMotorLoader loader = new GeneralMotorLoader(); + SimpleFileFilter fileFilter = new SimpleFileFilter("", loader.getSupportedExtensions()); + + log.info("Starting reading serialized motor database"); + FileIterator iterator = DirectoryIterator.findDirectory(THRUSTCURVE_DIRECTORY, new SimpleFileFilter("", false, "ser")); + while (iterator.hasNext()) { + Pair f = iterator.next(); + loadSerialized(f); + } + log.info("Ending reading serialized motor database, motorCount=" + motorCount); + + + log.info("Starting reading user-defined motors"); + for (File file : ((SwingPreferences) Application.getPreferences()).getUserThrustCurveFiles()) { + if (file.isFile()) { + loadFile(loader, file); + } else if (file.isDirectory()) { + loadDirectory(loader, fileFilter, file); + } else { + log.warn("User-defined motor file " + file + " is neither file nor directory"); + } + } + log.info("Ending reading user-defined motors, motorCount=" + motorCount); + + } + + + + @SuppressWarnings("unchecked") + private void loadSerialized(Pair f) { + try { + log.debug("Reading motors from file " + f.getU()); + ObjectInputStream ois = new ObjectInputStream(f.getV()); + List motors = (List) ois.readObject(); + addMotors(motors); + } catch (Exception ex) { + throw new BugException(ex); + } + } + + + private void loadFile(GeneralMotorLoader loader, File file) { + BufferedInputStream bis = null; + try { + log.debug("Loading motors from file " + file); + bis = new BufferedInputStream(new FileInputStream(file)); + List motors = loader.load(bis, file.getName()); + addMotors(motors); + bis.close(); + } catch (IOException e) { + log.warn("IOException while reading " + file + ": " + e, e); + if (bis != null) { + try { + bis.close(); + } catch (IOException e1) { + + } + } + } + } + + private void loadDirectory(GeneralMotorLoader loader, SimpleFileFilter fileFilter, File file) { + FileIterator iterator; + try { + iterator = new DirectoryIterator(file, fileFilter, true); + } catch (IOException e) { + log.warn("Unable to read directory " + file + ": " + e, e); + return; + } + while (iterator.hasNext()) { + Pair f = iterator.next(); + try { + List motors = loader.load(f.getV(), f.getU()); + addMotors(motors); + f.getV().close(); + } catch (IOException e) { + log.warn("IOException while loading file " + f.getU() + ": " + e, e); + try { + f.getV().close(); + } catch (IOException e1) { + } + } + } + } + + private synchronized void addMotors(List motors) { + for (Motor m : motors) { + motorCount++; + database.addMotor((ThrustCurveMotor) m); + } + } + + /** + * Returns the loaded database. If the database has not fully loaded, + * this blocks until it is. + * + * @return the motor database + */ + public ThrustCurveMotorSetDatabase getDatabase() { + blockUntilLoaded(); + return database; + } +} diff --git a/core/src/net/sf/openrocket/startup/SerializeMotors.java b/core/src/net/sf/openrocket/startup/SerializeMotors.java index 71279812d..2ffe1b5ab 100644 --- a/core/src/net/sf/openrocket/startup/SerializeMotors.java +++ b/core/src/net/sf/openrocket/startup/SerializeMotors.java @@ -2,66 +2,62 @@ package net.sf.openrocket.startup; import java.io.File; import java.io.FileOutputStream; -import java.io.IOException; import java.io.InputStream; import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.List; -import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; import net.sf.openrocket.file.iterator.DirectoryIterator; import net.sf.openrocket.file.iterator.FileIterator; -import net.sf.openrocket.file.motor.MotorLoaderHelper; +import net.sf.openrocket.file.motor.GeneralMotorLoader; import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.util.Pair; public class SerializeMotors { - - /** - * @param args - */ + public static void main(String[] args) throws Exception { - - Application.setPreferences( new SwingPreferences() ); - - File outFile = new File("resources/datafiles/thrustcurves","system.ser"); - + + if (args.length != 2) { + System.out.println("Usage: java " + SerializeMotors.class.getCanonicalName() + " "); + System.exit(1); + } + + String inputDir = args[0]; + String outputFile = args[1]; + + Application.setPreferences(new SwingPreferences()); + + File outFile = new File(outputFile); + FileOutputStream ofs = new FileOutputStream(outFile); final ObjectOutputStream oos = new ObjectOutputStream(ofs); - + final List allMotors = new ArrayList(); - - ThrustCurveMotorSetDatabase motorDB = new ThrustCurveMotorSetDatabase(false) { - - @Override - protected void loadMotors() { - - FileIterator iterator = DirectoryIterator.findDirectory("resources-src/datafiles/thrustcurves", new SimpleFileFilter("", false, "eng", "rse")); - - if ( iterator == null ) { - throw new RuntimeException("Can't find resources-src/thrustcurves directory"); - } - while( iterator.hasNext() ) { - Pair f = iterator.next(); - String fileName = f.getU(); - InputStream is = f.getV(); - - List motors = MotorLoaderHelper.load(is, fileName); - - allMotors.addAll(motors); - } - } - - }; - - motorDB.startLoading(); - + + + GeneralMotorLoader loader = new GeneralMotorLoader(); + FileIterator iterator = DirectoryIterator.findDirectory(inputDir, new SimpleFileFilter("", false, loader.getSupportedExtensions())); + if (iterator == null) { + System.out.println("Can't find resources-src/thrustcurves directory"); + System.exit(1); + } + while (iterator.hasNext()) { + Pair f = iterator.next(); + String fileName = f.getU(); + InputStream is = f.getV(); + + List motors = loader.load(is, fileName); + + allMotors.addAll(motors); + } + oos.writeObject(allMotors); - + + oos.flush(); ofs.flush(); ofs.close(); } - + } diff --git a/core/test/net/sf/openrocket/IntegrationTest.java b/core/test/net/sf/openrocket/IntegrationTest.java index b06a6c34c..2a1d52995 100644 --- a/core/test/net/sf/openrocket/IntegrationTest.java +++ b/core/test/net/sf/openrocket/IntegrationTest.java @@ -11,7 +11,8 @@ import javax.swing.Action; import net.sf.openrocket.aerodynamics.AerodynamicCalculator; import net.sf.openrocket.aerodynamics.BarrowmanCalculator; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; +import net.sf.openrocket.database.motor.MotorDatabase; +import net.sf.openrocket.database.motor.ThrustCurveMotorSetDatabase; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.file.DatabaseMotorFinder; @@ -36,14 +37,28 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.BaseTestCase.BaseTestCase; -import org.junit.BeforeClass; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.jmock.auto.Mock; +import org.jmock.integration.junit4.JMock; +import org.jmock.integration.junit4.JUnit4Mockery; +import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; + +import com.google.inject.Injector; /** * This class contains various integration tests that simulate user actions that * might be performed. */ +@RunWith(JMock.class) public class IntegrationTest extends BaseTestCase { + Mockery context = new JUnit4Mockery(); + + @Mock + Injector injector; + private OpenRocketDocument document; private Action undoAction, redoAction; @@ -54,31 +69,39 @@ public class IntegrationTest extends BaseTestCase { private FlightConditions conditions; - @BeforeClass - public static void initialize() { - ThrustCurveMotorSetDatabase db = new ThrustCurveMotorSetDatabase(false) { - @Override - protected void loadMotors() { - GeneralMotorLoader loader = new GeneralMotorLoader(); - InputStream is = this.getClass().getResourceAsStream("Estes_A8.rse"); - assertNotNull("Problem in unit test, cannot find Estes_A8.rse", is); - try { - for (Motor m : loader.load(is, "Estes_A8.rse")) { - addMotor((ThrustCurveMotor) m); - } - is.close(); - } catch (IOException e) { - e.printStackTrace(); - fail("IOException: " + e); - } + @Before + public void initialize() { + final ThrustCurveMotorSetDatabase db = new ThrustCurveMotorSetDatabase(); + db.addMotor(readMotor()); + + context.checking(new Expectations() { + { + allowing(injector).getInstance(MotorDatabase.class); + will(returnValue(db)); } - }; - db.startLoading(); + }); + assertEquals(1, db.getMotorSets().size()); - Application.setMotorSetDatabase(db); + Application.setInjector(injector); Application.setBaseTranslator(new ResourceBundleTranslator("l10n.messages")); } + private static ThrustCurveMotor readMotor() { + GeneralMotorLoader loader = new GeneralMotorLoader(); + InputStream is = IntegrationTest.class.getResourceAsStream("Estes_A8.rse"); + assertNotNull("Problem in unit test, cannot find Estes_A8.rse", is); + try { + for (Motor m : loader.load(is, "Estes_A8.rse")) { + return (ThrustCurveMotor) m; + } + is.close(); + } catch (IOException e) { + e.printStackTrace(); + fail("IOException: " + e); + } + throw new RuntimeException("Could not load motor"); + } + /** * Tests loading a rocket design, modifying it, simulating it and the undo/redo * mechanism in various combinations. diff --git a/core/test/net/sf/openrocket/database/MotorSetDatabaseTest.java b/core/test/net/sf/openrocket/database/MotorSetDatabaseTest.java deleted file mode 100644 index 06e8d835e..000000000 --- a/core/test/net/sf/openrocket/database/MotorSetDatabaseTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.sf.openrocket.database; - -import static org.junit.Assert.*; - -import java.util.List; - -import net.sf.openrocket.motor.Manufacturer; -import net.sf.openrocket.motor.Motor; -import net.sf.openrocket.motor.ThrustCurveMotor; -import net.sf.openrocket.util.Coordinate; - -import org.junit.Test; - - -public class MotorSetDatabaseTest { - - @Test - public void testMotorLoading() { - - ThrustCurveMotorSetDatabase db = new ThrustCurveMotorSetDatabase(true) { - @Override - protected void loadMotors() { - try { - Thread.sleep(200); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - this.addMotor(new ThrustCurveMotor(Manufacturer.getManufacturer("A"), - "Foo", "Desc", Motor.Type.SINGLE, new double[] { 0 }, - 0.024, 0.07, new double[] { 0, 1, 2 }, new double[] {0, 1, 0}, - new Coordinate[] {Coordinate.NUL, Coordinate.NUL, Coordinate.NUL}, "digestA")); - this.addMotor(new ThrustCurveMotor(Manufacturer.getManufacturer("A"), - "Bar", "Desc", Motor.Type.SINGLE, new double[] { 0 }, - 0.024, 0.07, new double[] { 0, 1, 2 }, new double[] {0, 1, 0}, - new Coordinate[] {Coordinate.NUL, Coordinate.NUL, Coordinate.NUL}, "digestB")); - this.addMotor(new ThrustCurveMotor(Manufacturer.getManufacturer("A"), - "Foo", "Desc", Motor.Type.UNKNOWN, new double[] { 0 }, - 0.024, 0.07, new double[] { 0, 1, 2 }, new double[] {0, 1, 0}, - new Coordinate[] {Coordinate.NUL, Coordinate.NUL, Coordinate.NUL}, "digestA")); - } - }; - - assertFalse(db.isLoaded()); - db.startLoading(); - assertFalse(db.isLoaded()); - List list = db.getMotorSets(); - assertTrue(db.isLoaded()); - - assertEquals(2, list.size()); - assertEquals(1, list.get(0).getMotors().size()); - assertEquals(1, list.get(1).getMotors().size()); - assertEquals("Bar", list.get(0).getMotors().get(0).getDesignation()); - assertEquals("Foo", list.get(1).getMotors().get(0).getDesignation()); - } - -} diff --git a/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java b/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java index 2432f279a..40bf5e942 100644 --- a/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java +++ b/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.*; import java.util.Arrays; import java.util.Collections; +import net.sf.openrocket.database.motor.ThrustCurveMotorSet; import net.sf.openrocket.motor.Manufacturer; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; diff --git a/core/test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java b/core/test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java index 7feb8d232..8861eec52 100644 --- a/core/test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/export/RocksimDocumentDTOTest.java @@ -1,66 +1,70 @@ package net.sf.openrocket.file.rocksim.export; +import java.io.File; +import java.io.FileWriter; +import java.io.StringWriter; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Marshaller; + import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.rocksim.importt.RocksimLoader; import net.sf.openrocket.file.rocksim.importt.RocksimLoaderTest; import net.sf.openrocket.file.rocksim.importt.RocksimTestBase; + import org.junit.Assert; import org.junit.Test; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import java.io.File; -import java.io.FileWriter; -import java.io.StringWriter; - /** */ public class RocksimDocumentDTOTest extends RocksimTestBase { - - @Test - public void testDTO() throws Exception { - JAXBContext binder = JAXBContext.newInstance(RocksimDocumentDTO.class); - Marshaller marshaller = binder.createMarshaller(); - marshaller.setProperty("jaxb.fragment", Boolean.TRUE); - - NoseConeDTO noseCone = new NoseConeDTO(); - noseCone.setBaseDia(10d); - noseCone.setCalcCG(1.3d); - - StageDTO stage1 = new StageDTO(); - stage1.addExternalPart(noseCone); - - RocketDesignDTO design2 = new RocketDesignDTO(); - design2.setName("Test"); - design2.setStage3(stage1); - - RocksimDesignDTO design = new RocksimDesignDTO(); - design.setDesign(design2); - RocksimDocumentDTO message = new RocksimDocumentDTO(); - message.setDesign(design); - - - StringWriter stringWriter = new StringWriter(); - marshaller.marshal(message, stringWriter); - - String response = stringWriter.toString(); - - System.err.println(response); - } - - @Test - public void testRoundTrip() throws Exception { - OpenRocketDocument ord = RocksimLoaderTest.loadRocksimRocket3(new RocksimLoader()); - - Assert.assertNotNull(ord); - String result = new RocksimSaver().marshalToRocksim(ord); - -// System.err.println(result); - - File output = new File("rt.rkt"); - FileWriter fw = new FileWriter(output); - fw.write(result); - fw.flush(); - fw.close(); - } + + @Test + public void testDTO() throws Exception { + JAXBContext binder = JAXBContext.newInstance(RocksimDocumentDTO.class); + Marshaller marshaller = binder.createMarshaller(); + marshaller.setProperty("jaxb.fragment", Boolean.TRUE); + + NoseConeDTO noseCone = new NoseConeDTO(); + noseCone.setBaseDia(10d); + noseCone.setCalcCG(1.3d); + + StageDTO stage1 = new StageDTO(); + stage1.addExternalPart(noseCone); + + RocketDesignDTO design2 = new RocketDesignDTO(); + design2.setName("Test"); + design2.setStage3(stage1); + + RocksimDesignDTO design = new RocksimDesignDTO(); + design.setDesign(design2); + RocksimDocumentDTO message = new RocksimDocumentDTO(); + message.setDesign(design); + + + StringWriter stringWriter = new StringWriter(); + marshaller.marshal(message, stringWriter); + + String response = stringWriter.toString(); + + System.err.println(response); + } + + @Test + public void testRoundTrip() throws Exception { + OpenRocketDocument ord = RocksimLoaderTest.loadRocksimRocket3(new RocksimLoader()); + + Assert.assertNotNull(ord); + String result = new RocksimSaver().marshalToRocksim(ord); + + // System.err.println(result); + + File output = new File("rt.rkt"); + FileWriter fw = new FileWriter(output); + fw.write(result); + fw.flush(); + fw.close(); + + output.delete(); + } }