diff --git a/JavaReverseEngineer.js b/JavaReverseEngineer.js
index 2aadb2b..91148f2 100644
--- a/JavaReverseEngineer.js
+++ b/JavaReverseEngineer.js
@@ -28,7 +28,7 @@ define(function (require, exports, module) {
 
     var Core            = staruml.getModule("core/Core"),
         Repository      = staruml.getModule("engine/Repository"),
-        CommandManager  = staruml.getModule("command/CommandManager"),
+        CommandManager  = staruml.getModule("menu/CommandManager"),
         UML             = staruml.getModule("uml/UML"),
         FileSystem      = staruml.getModule("filesystem/FileSystem"),
         FileSystemError = staruml.getModule("filesystem/FileSystemError"),
diff --git a/main.js b/main.js
index f35e4a3..5273bf4 100644
--- a/main.js
+++ b/main.js
@@ -30,8 +30,8 @@ define(function (require, exports, module) {
     var AppInit             = staruml.getModule("utils/AppInit"),
         Repository          = staruml.getModule("engine/Repository"),
         Engine              = staruml.getModule("engine/Engine"),
-        Commands            = staruml.getModule("command/Commands"),
-        CommandManager      = staruml.getModule("command/CommandManager"),
+        Commands            = staruml.getModule("menu/Commands"),
+        CommandManager      = staruml.getModule("menu/CommandManager"),
         MenuManager         = staruml.getModule("menu/MenuManager"),
         Dialogs             = staruml.getModule("dialogs/Dialogs"),
         ElementPickerDialog = staruml.getModule("dialogs/ElementPickerDialog"),