diff --git a/src/ui/Event.js b/src/event/Event.js
similarity index 100%
rename from src/ui/Event.js
rename to src/event/Event.js
diff --git a/src/ui/Key.js b/src/event/Key.js
similarity index 98%
rename from src/ui/Key.js
rename to src/event/Key.js
index 3057bea3..bdb922aa 100644
--- a/src/ui/Key.js
+++ b/src/event/Key.js
@@ -139,7 +139,7 @@ var Key = new function() {
 
     DomEvent.add(window, {
         blur: function(event) {
-            // Fire key-up events for all currently pressed keys.
+            // Emit key-up events for all currently pressed keys.
             for (var code in charCodeMap)
                 handleKey(false, code, charCodeMap[code], event);
         }
diff --git a/src/ui/KeyEvent.js b/src/event/KeyEvent.js
similarity index 100%
rename from src/ui/KeyEvent.js
rename to src/event/KeyEvent.js
diff --git a/src/ui/MouseEvent.js b/src/event/MouseEvent.js
similarity index 100%
rename from src/ui/MouseEvent.js
rename to src/event/MouseEvent.js
diff --git a/src/paper.js b/src/paper.js
index 89087301..0bdab168 100644
--- a/src/paper.js
+++ b/src/paper.js
@@ -112,10 +112,10 @@ var paper = new function(undefined) {
 /*#*/ include('view/CanvasView.js');
 
 /*#*/ if (__options.environment == 'browser') {
-/*#*/     include('ui/Event.js');
-/*#*/     include('ui/KeyEvent.js');
-/*#*/     include('ui/Key.js');
-/*#*/     include('ui/MouseEvent.js');
+/*#*/     include('event/Event.js');
+/*#*/     include('event/KeyEvent.js');
+/*#*/     include('event/Key.js');
+/*#*/     include('event/MouseEvent.js');
 
 /*#*/     include('tool/ToolEvent.js');
 /*#*/     include('tool/Tool.js');