diff --git a/classes/bays/Motor.m b/classes/bays/Motor.m
index f07892b76d8093bdbe2b4186ddd24bbb332d1baf..72267804e965c0b0a3410ab8a324eca2b0817d63 100644
--- a/classes/bays/Motor.m
+++ b/classes/bays/Motor.m
@@ -28,8 +28,8 @@ classdef Motor < Bay
     end
 
     properties(Access = protected)
-        configName = 'motorConfig.m'
-        variableName = ''
+        configName = 'rocketConfig.m'
+        variableName = 'motor'
         mission Mission = Mission()
     end
 
diff --git a/classes/old/Environment.m b/classes/components/Environment.m
similarity index 82%
rename from classes/old/Environment.m
rename to classes/components/Environment.m
index 6c503a6bd82519a49c3538e989c402d546b6bfdf..35c2c91d75af6e301d39717bed19bed881973a9f 100644
--- a/classes/old/Environment.m
+++ b/classes/components/Environment.m
@@ -1,4 +1,4 @@
-classdef Environment < Config
+classdef Environment < Component
     %ENVIRONMENT Summary of this class goes here
     %   Detailed explanation goes here
 
@@ -22,22 +22,12 @@ classdef Environment < Config
 
     properties(Access = protected)
         configName = 'environmentConfig.m'
+        variableName = ''
         mission Mission
         motor Motor
     end
 
     methods
-        function obj = Environment(mission, motor)
-            arguments
-                mission Mission = Mission()
-                motor Motor = Motor()
-            end
-            obj.mission = mission;
-            obj.motor = motor;
-            if nargin == 0, return; end
-            obj.loadConfig();
-        end
-
         function g0 = get.g0(obj)
             g0 = gravitywgs84(obj.z0, obj.lat0);
         end
diff --git a/classes/components/Parachute.m b/classes/components/Parachute.m
new file mode 100644
index 0000000000000000000000000000000000000000..b2d0575394f4c1e017334c0c152f9a342b063db1
--- /dev/null
+++ b/classes/components/Parachute.m
@@ -0,0 +1,23 @@
+classdef Parachute
+    %PARACHUTE Summary of this class goes here
+    %   Detailed explanation goes here
+    
+    properties
+        Property1
+    end
+    
+    methods
+        function obj = Parachute(inputArg1,inputArg2)
+            %PARACHUTE Construct an instance of this class
+            %   Detailed explanation goes here
+            obj.Property1 = inputArg1 + inputArg2;
+        end
+        
+        function outputArg = method1(obj,inputArg)
+            %METHOD1 Summary of this method goes here
+            %   Detailed explanation goes here
+            outputArg = obj.Property1 + inputArg;
+        end
+    end
+end
+
diff --git a/classes/components/Wind.m b/classes/components/Wind.m
new file mode 100644
index 0000000000000000000000000000000000000000..54ab2c3e2a246e04d669e5e0ec9457135e73a2dd
--- /dev/null
+++ b/classes/components/Wind.m
@@ -0,0 +1,23 @@
+classdef untitled
+    %UNTITLED Summary of this class goes here
+    %   Detailed explanation goes here
+    
+    properties
+        Property1
+    end
+    
+    methods
+        function obj = untitled(inputArg1,inputArg2)
+            %UNTITLED Construct an instance of this class
+            %   Detailed explanation goes here
+            obj.Property1 = inputArg1 + inputArg2;
+        end
+        
+        function outputArg = method1(obj,inputArg)
+            %METHOD1 Summary of this method goes here
+            %   Detailed explanation goes here
+            outputArg = obj.Property1 + inputArg;
+        end
+    end
+end
+