diff --git a/examples/Tools/Circles.html b/examples/Tools/Circles.html
index 043df411..fc58b908 100644
--- a/examples/Tools/Circles.html
+++ b/examples/Tools/Circles.html
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Clouds.html b/examples/Tools/Clouds.html
index 640e8317..34d55740 100644
--- a/examples/Tools/Clouds.html
+++ b/examples/Tools/Clouds.html
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Dripping Brush.html b/examples/Tools/Dripping Brush.html
index 9c51d1b8..04192a04 100644
--- a/examples/Tools/Dripping Brush.html	
+++ b/examples/Tools/Dripping Brush.html	
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Fancy Brush.html b/examples/Tools/Fancy Brush.html
index 0f866d96..0fda427c 100644
--- a/examples/Tools/Fancy Brush.html	
+++ b/examples/Tools/Fancy Brush.html	
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Grid.html b/examples/Tools/Grid.html
index 38bc7f39..b7293193 100644
--- a/examples/Tools/Grid.html
+++ b/examples/Tools/Grid.html
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			
diff --git a/examples/Tools/MultiLines.html b/examples/Tools/MultiLines.html
index a192ed3a..88428d3f 100644
--- a/examples/Tools/MultiLines.html
+++ b/examples/Tools/MultiLines.html
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Wave.html b/examples/Tools/Wave.html
index d4f0ad2f..de6a152a 100644
--- a/examples/Tools/Wave.html
+++ b/examples/Tools/Wave.html
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');
diff --git a/examples/Tools/Worm Farm.html b/examples/Tools/Worm Farm.html
index 0fe2c660..c6426fc6 100644
--- a/examples/Tools/Worm Farm.html	
+++ b/examples/Tools/Worm Farm.html	
@@ -16,9 +16,9 @@
 	<script type="text/javascript" src="../../src/document/Doc.js"></script>
 	<script type="text/javascript" src="../../src/item/Layer.js"></script>
 	<script type="text/javascript" src="../../src/item/Group.js"></script>
-	<script type="text/javascript" src="../../src/ToolEvent.js"></script>
-	<script type="text/javascript" src="../../src/ToolHandler.js"></script>
-	<script type="text/javascript" src="../../src/Tool.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>
 		window.onload = function() {
 			var canvas = document.getElementById('canvas');