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 056b403..e21f97c 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj	
@@ -74,21 +74,21 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Verbs\DrawingVerbs\Circle.cs" />
-    <Compile Include="Verbs\DrawingVerbs\Clear.cs" />
-    <Compile Include="Verbs\DrawingVerbs\Dot.cs" />
-    <Compile Include="Verbs\DrawingVerbs\DrawLines.cs" />
-    <Compile Include="Verbs\DrawingVerbs\DrawTo.cs" />
-    <Compile Include="Verbs\DrawingVerbs\Fill.cs" />
-    <Compile Include="Verbs\DrawingVerbs\FillColor.cs" />
-    <Compile Include="Verbs\DrawingVerbs\MoveTo.cs" />
-    <Compile Include="Verbs\DrawingVerbs\PenColor.cs" />
-    <Compile Include="Verbs\DrawingVerbs\Quadrilateral.cs" />
-    <Compile Include="Verbs\DrawingVerbs\Rectangle.cs" />
-    <Compile Include="Verbs\DrawingVerbs\RegularPolygon.cs" />
-    <Compile Include="Verbs\DrawingVerbs\ResetPen.cs" />
-    <Compile Include="Verbs\DrawingVerbs\Square.cs" />
-    <Compile Include="Verbs\DrawingVerbs\Triangle.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\Circle.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Actions\Clear.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\Dot.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Actions\DrawLines.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\DrawTo.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Color\Fill.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Color\FillColor.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\MoveTo.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Color\PenColor.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\Quadrilateral.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\Rectangle.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\RegularPolygon.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Actions\ResetPen.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\Square.cs" />
+    <Compile Include="Verbs\DrawingVerbs\Shape\Triangle.cs" />
     <Compile Include="Verbs\Value\ValueObjects\PointValue.cs" />
     <Compile Include="Verbs\Value\ValueTypes\ExpressionValue.cs" />
     <Compile Include="Verbs\Value\DeclareVariable.cs" />
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/Clear.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Clear.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/Clear.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawLines.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/DrawLines.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/ResetPen.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/ResetPen.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Actions/ResetPen.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/Fill.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Fill.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/Fill.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/FillColor.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/FillColor.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/PenColor.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Color/PenColor.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Circle.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Circle.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Circle.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Dot.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Dot.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Dot.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/DrawTo.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/DrawTo.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/MoveTo.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/MoveTo.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Quadrilateral.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Quadrilateral.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Rectangle.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Rectangle.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/RegularPolygon.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/RegularPolygon.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Square.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Square.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Square.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs
similarity index 100%
rename from Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Triangle.cs
rename to Advanced Software Engineering/Advanced Software Engineering/Verbs/DrawingVerbs/Shape/Triangle.cs
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs
index 1d4139d..7d4e3a2 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueObjects/PointValue.cs	
@@ -7,16 +7,16 @@ namespace Advanced_Software_Engineering.Verbs.Value.ValueObjects {
         private IValue x;
         private IValue y;
 
-        public PointValue(int x, int y) {
-            this.x = new IntValue(x);
-            this.y = new IntValue(y);
-        }
-
         public PointValue(IValue x, IValue y) {
             this.x = x;
             this.y = y;
         }
 
+        public PointValue(Drawer drawer, string parameter1, string parameter2) {
+            x = ValueFactory.CreateValue(drawer, parameter1);
+            y = ValueFactory.CreateValue(drawer, parameter2);
+        }
+
         public PointValue(string parameter1, string parameter2) {
             x = ValueFactory.CreateValue(parameter1, "int");
             y = ValueFactory.CreateValue(parameter2, "int");