diff --git a/examples/Animated/RoundedRectangles.html b/examples/Animated/RoundedRectangles.html
index e5ae11c0..dc179987 100644
--- a/examples/Animated/RoundedRectangles.html
+++ b/examples/Animated/RoundedRectangles.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		var doc, mousePoint, amount = 25;
 		var count = 0, paths = [];
diff --git a/examples/Animated/animatedStar.html b/examples/Animated/animatedStar.html
index 3f357fb8..1c0c8fdc 100644
--- a/examples/Animated/animatedStar.html
+++ b/examples/Animated/animatedStar.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		var canvas, doc;
 		var count = 0;
diff --git a/examples/Scripts/BouncingBalls.html b/examples/Scripts/BouncingBalls.html
index 6e373be4..1a19a7bb 100644
--- a/examples/Scripts/BouncingBalls.html
+++ b/examples/Scripts/BouncingBalls.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		var count = 0, balls = [];
 		var ball;
diff --git a/examples/Scripts/arcTo.html b/examples/Scripts/arcTo.html
index 6659c8b7..8eea2ada 100644
--- a/examples/Scripts/arcTo.html
+++ b/examples/Scripts/arcTo.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Scripts/circle.html b/examples/Scripts/circle.html
index 0e147ca3..b8485229 100644
--- a/examples/Scripts/circle.html
+++ b/examples/Scripts/circle.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		var count = 0;
 		var doc;
diff --git a/examples/Scripts/letter.html b/examples/Scripts/letter.html
index 07377f18..11c3e7c1 100644
--- a/examples/Scripts/letter.html
+++ b/examples/Scripts/letter.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Scripts/lines.html b/examples/Scripts/lines.html
index 7c6ac780..5ef1fdc3 100644
--- a/examples/Scripts/lines.html
+++ b/examples/Scripts/lines.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		var count = 0;
 		var doc;
diff --git a/examples/Scripts/rectangle.html b/examples/Scripts/rectangle.html
index 3b037211..da16e932 100644
--- a/examples/Scripts/rectangle.html
+++ b/examples/Scripts/rectangle.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		var count = 0;
 		var doc;
diff --git a/examples/Scripts/roundRectangle.html b/examples/Scripts/roundRectangle.html
index 7b727001..9706b307 100644
--- a/examples/Scripts/roundRectangle.html
+++ b/examples/Scripts/roundRectangle.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		var count = 0;
 		var doc;
diff --git a/examples/Scripts/star.html b/examples/Scripts/star.html
index 63ab8731..20836091 100644
--- a/examples/Scripts/star.html
+++ b/examples/Scripts/star.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
@@ -31,7 +32,6 @@
 				var vector = new Point(1 + 10 * i, 0).rotate(i);
 				var l = vector.length;
 				var path = new Path();
-				// path.strokeColor = '#000000';
 				path.fillColor = i % 2 ? 'red' : 'black';
 				path.closed = true;
 				for (var j = 0; j < 32; j++) {
diff --git a/examples/Scripts/strokeJoin.html b/examples/Scripts/strokeJoin.html
index a0cf2cac..20ae0844 100644
--- a/examples/Scripts/strokeJoin.html
+++ b/examples/Scripts/strokeJoin.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Circles.html b/examples/Tools/Circles.html
index 1be869c3..96229e8e 100644
--- a/examples/Tools/Circles.html
+++ b/examples/Tools/Circles.html
@@ -21,6 +21,8 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
+
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Clouds.html b/examples/Tools/Clouds.html
index dccd906e..9dcab8c0 100644
--- a/examples/Tools/Clouds.html
+++ b/examples/Tools/Clouds.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Dripping Brush.html b/examples/Tools/Dripping Brush.html
index 8fbf5fdc..e70974d7 100644
--- a/examples/Tools/Dripping Brush.html	
+++ b/examples/Tools/Dripping Brush.html	
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Fancy Brush.html b/examples/Tools/Fancy Brush.html
index 6de7f47e..67b87c8b 100644
--- a/examples/Tools/Fancy Brush.html	
+++ b/examples/Tools/Fancy Brush.html	
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Grid.html b/examples/Tools/Grid.html
index d16b1ba4..102a8d0a 100644
--- a/examples/Tools/Grid.html
+++ b/examples/Tools/Grid.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			
diff --git a/examples/Tools/MultiLines.html b/examples/Tools/MultiLines.html
index 501bfbd4..9e227b34 100644
--- a/examples/Tools/MultiLines.html
+++ b/examples/Tools/MultiLines.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Wave.html b/examples/Tools/Wave.html
index 41a69381..aaf464eb 100644
--- a/examples/Tools/Wave.html
+++ b/examples/Tools/Wave.html
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Worm Farm.html b/examples/Tools/Worm Farm.html
index 5ec1d68b..e2bf6084 100644
--- a/examples/Tools/Worm Farm.html	
+++ b/examples/Tools/Worm Farm.html	
@@ -21,6 +21,7 @@
 	<script type="text/javascript" src="../../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../../src/path/Path.js"></script>
+	<script type="text/javascript" src="../../src/path/Path.Constructors.js"></script>
 	<script>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/test/index.html b/test/index.html
index 16b85fce..6a11e58e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -6,19 +6,22 @@
 	<!-- Libraries -->
 	<script type="text/javascript" src="../lib/Bootstrap.js"></script>
 	<script type="text/javascript" src="../src/Paper.js"></script>
-	<script type="text/javascript" src="../src/item/Item.js"></script>
-	<script type="text/javascript" src="../src/path/PathItem.js"></script>
+	<script type="text/javascript" src="../src/tool/ToolEvent.js"></script>
+	<script type="text/javascript" src="../src/tool/ToolHandler.js"></script>
+	<script type="text/javascript" src="../src/tool/Tool.js"></script>
 	<script type="text/javascript" src="../src/basic/Point.js"></script>
 	<script type="text/javascript" src="../src/basic/Rectangle.js"></script>
 	<script type="text/javascript" src="../src/basic/Size.js"></script>
 	<script type="text/javascript" src="../src/basic/Matrix.js"></script>
+	<script type="text/javascript" src="../src/document/Doc.js"></script>
+	<script type="text/javascript" src="../src/item/Item.js"></script>
 	<script type="text/javascript" src="../src/item/Group.js"></script>
 	<script type="text/javascript" src="../src/item/Layer.js"></script>
+	<script type="text/javascript" src="../src/item/PathStyle.js"></script>
 	<script type="text/javascript" src="../src/path/Segment.js"></script>
 	<script type="text/javascript" src="../src/path/PathItem.js"></script>
 	<script type="text/javascript" src="../src/path/Path.js"></script>
-	<script type="text/javascript" src="../src/document/Doc.js"></script>
-	<script type="text/javascript" src="../src/item/PathStyle.js"></script>
+	<script type="text/javascript" src="../src/path/Path.Constructors.js"></script>
 	<script type="text/javascript" src="lib/qunit/qunit.js"></script>
 	
 	<!-- Test Helpers -->