diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index f3345648..c64a8629 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -373,7 +373,7 @@ function buildAce(aceProject, options) {
             source: [
                 {
                     project: cloneProject(project),
-                    require: [ 'ace/keyboard/keybinding/' + keybinding ]
+                    require: [ 'ace/keyboard/' + keybinding ]
                 }
             ],
             filter: filters,
diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index bcd240ff..a0f98e1f 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -50,8 +50,8 @@ var theme = require("ace/theme/textmate");
 var EditSession = require("ace/edit_session").EditSession;
 var UndoManager = require("ace/undomanager").UndoManager;
 
-var vim = require("ace/keyboard/keybinding/vim").Vim;
-var emacs = require("ace/keyboard/keybinding/emacs").Emacs;
+var vim = require("ace/keyboard/vim").handler;
+var emacs = require("ace/keyboard/emacs").handler;
 var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
 
 var modesByName;
diff --git a/lib/ace/keyboard/keybinding/emacs.js b/lib/ace/keyboard/emacs.js
similarity index 99%
rename from lib/ace/keyboard/keybinding/emacs.js
rename to lib/ace/keyboard/emacs.js
index 1c4619fd..e912f589 100644
--- a/lib/ace/keyboard/keybinding/emacs.js
+++ b/lib/ace/keyboard/emacs.js
@@ -145,6 +145,6 @@ var emacsState = {
     ]
 };
 
-exports.Emacs = new StateHandler(emacsState);
+exports.handler = new StateHandler(emacsState);
 
 });
diff --git a/lib/ace/keyboard/keybinding/vim.js b/lib/ace/keyboard/vim.js
similarity index 98%
rename from lib/ace/keyboard/keybinding/vim.js
rename to lib/ace/keyboard/vim.js
index 6cc5d912..78367c2d 100644
--- a/lib/ace/keyboard/keybinding/vim.js
+++ b/lib/ace/keyboard/vim.js
@@ -133,6 +133,6 @@ var vimStates = {
     ]
 };
 
-exports.Vim = new StateHandler(vimStates);
+exports.handler = new StateHandler(vimStates);
 
 });