diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj
index 5a0b12b..820612b 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
@@ -82,7 +82,7 @@
     <Compile Include="Windows\AboutWindow.Designer.cs">
       <DependentUpon>AboutWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="Command.cs" />
+    <Compile Include="Verbs\VerbFactory.cs" />
     <Compile Include="Commander.cs" />
     <Compile Include="Drawer.cs" />
     <Compile Include="Windows\DrawPreview.cs">
diff --git a/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs b/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs
index 4bf1ff8..f9aa4bd 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/SettingsAndHelperFunctions.cs	
@@ -84,6 +84,7 @@ namespace Advanced_Software_Engineering {
             return double.Parse(text);
         }
 
+        //TODO: Make unit tests for this function
         public static Point ConvertToPoint(string text1, string text2) {
             return new Point(ConvertToInt(text1), ConvertToInt(text2));
         }
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Command.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
similarity index 98%
rename from Advanced Software Engineering/Advanced Software Engineering/Command.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs
index b95b281..450acbb 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Command.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs	
@@ -139,13 +139,4 @@ namespace Advanced_Software_Engineering {
 
         }
     }
-
-    abstract class Value {
-
-    }
-
-    class FlowControl //: Verb //This one will help us in part 2
-    {
-
-    }
 }