diff --git a/build.xml b/build.xml
index 4fe8977..7deaa2c 100644
--- a/build.xml
+++ b/build.xml
@@ -75,8 +75,8 @@
       <classpath>
         <pathelement path="src/docs/java"/>      
       </classpath>
-      <arg value="src/docs/javascript/generateApiDocs.js"/>
-      <arg value="src/main/javascript"/>
+      <arg value="src/docs/js/generateApiDocs.js"/>
+      <arg value="src/main/js"/>
     </java>
 
   </target>
@@ -103,7 +103,7 @@ Walter Higgins
       <classpath>
         <pathelement path="src/docs/java"/>      
       </classpath>
-      <arg value="src/docs/javascript/generateTOC.js"/>
+      <arg value="src/docs/js/generateTOC.js"/>
       <arg value="${dist}/apiref.md"/>
     </java>
   </target>
@@ -113,7 +113,7 @@ Walter Higgins
       <classpath>
         <pathelement path="src/docs/java"/>      
       </classpath>
-      <arg value="src/docs/javascript/generateTOC.js"/>
+      <arg value="src/docs/js/generateTOC.js"/>
       <arg value="src/docs/templates/ypgpm.md"/>
     </java>
   </target>
@@ -134,7 +134,7 @@ Walter Higgins
   <target name="zip_lib" depends="init">
     <delete file="${build}/lib.zip"/>
     <zip destfile="${build}/lib.zip" 
-         basedir="./src/main/javascript" 
+         basedir="./src/main/js" 
          excludes="modules/**, plugins/**,">
     </zip>
   </target>
@@ -142,7 +142,7 @@ Walter Higgins
   <target name="zip_modules" depends="init">
     <delete file="${build}/modules.zip"/>
     <zip destfile="${build}/modules.zip" 
-         basedir="./src/main/javascript" 
+         basedir="./src/main/js" 
          excludes="lib/**, plugins/**,">
     </zip>
   </target>
@@ -150,7 +150,7 @@ Walter Higgins
   <target name="zip_plugins" depends="init">
     <delete file="${build}/plugins.zip"/>
     <zip destfile="${build}/plugins.zip" 
-         basedir="./src/main/javascript"
+         basedir="./src/main/js"
          excludes="lib/**, modules/**">
     </zip>
   </target>
diff --git a/src/docs/javascript/generateApiDocs.js b/src/docs/js/generateApiDocs.js
similarity index 100%
rename from src/docs/javascript/generateApiDocs.js
rename to src/docs/js/generateApiDocs.js
diff --git a/src/docs/javascript/generateTOC.js b/src/docs/js/generateTOC.js
similarity index 100%
rename from src/docs/javascript/generateTOC.js
rename to src/docs/js/generateTOC.js
diff --git a/src/main/javascript/lib/command.js b/src/main/js/lib/command.js
similarity index 100%
rename from src/main/javascript/lib/command.js
rename to src/main/js/lib/command.js
diff --git a/src/main/javascript/lib/console.js b/src/main/js/lib/console.js
similarity index 100%
rename from src/main/javascript/lib/console.js
rename to src/main/js/lib/console.js
diff --git a/src/main/javascript/lib/events.js b/src/main/js/lib/events.js
similarity index 100%
rename from src/main/javascript/lib/events.js
rename to src/main/js/lib/events.js
diff --git a/src/main/javascript/lib/js-patch.js b/src/main/js/lib/js-patch.js
similarity index 100%
rename from src/main/javascript/lib/js-patch.js
rename to src/main/js/lib/js-patch.js
diff --git a/src/main/javascript/lib/json2.js b/src/main/js/lib/json2.js
similarity index 100%
rename from src/main/javascript/lib/json2.js
rename to src/main/js/lib/json2.js
diff --git a/src/main/javascript/lib/persistence.js b/src/main/js/lib/persistence.js
similarity index 100%
rename from src/main/javascript/lib/persistence.js
rename to src/main/js/lib/persistence.js
diff --git a/src/main/javascript/lib/plugin.js b/src/main/js/lib/plugin.js
similarity index 87%
rename from src/main/javascript/lib/plugin.js
rename to src/main/js/lib/plugin.js
index a85cbb3..819461d 100644
--- a/src/main/javascript/lib/plugin.js
+++ b/src/main/js/lib/plugin.js
@@ -13,7 +13,7 @@ var _plugin = function(/* String */ moduleName, /* Object */ moduleObject, isPer
   //
   // don't load plugin more than once
   //
-  if (typeof _plugins[moduleName] != "undefined")
+  if (typeof _plugins[moduleName] != 'undefined')
     return _plugins[moduleName].module;
 
   var pluginData = {persistent: isPersistent, module: moduleObject};
@@ -34,14 +34,14 @@ var scriptCraftDir = null;
 var pluginDir = null;
 var dataDir = null;
 
-exports.autoload = function(dir) {
+exports.autoload = function(dir,logger) {
 
   scriptCraftDir = dir;
-  pluginDir = new File(dir, "plugins");
-  dataDir = new File(dir, "data");
+  pluginDir = new File(dir, 'plugins');
+  dataDir = new File(dir, 'data');
 
   var _canonize = function(file){ 
-    return '' + file.canonicalPath.replaceAll("\\\\","/"); 
+    return '' + file.canonicalPath.replaceAll('\\\\','/'); 
   };
   /*
    recursively walk the given directory and return a list of all .js files 
@@ -85,7 +85,7 @@ exports.autoload = function(dir) {
           global[property] = module[property];
         }
       }catch (e){
-        
+	logger.severe('Plugin ' + pluginPath + ' ' + e);
       }
     }
   };
diff --git a/src/main/javascript/lib/readme.md b/src/main/js/lib/readme.md
similarity index 100%
rename from src/main/javascript/lib/readme.md
rename to src/main/js/lib/readme.md
diff --git a/src/main/javascript/lib/require.js b/src/main/js/lib/require.js
similarity index 100%
rename from src/main/javascript/lib/require.js
rename to src/main/js/lib/require.js
diff --git a/src/main/javascript/lib/scriptcraft.js b/src/main/js/lib/scriptcraft.js
similarity index 97%
rename from src/main/javascript/lib/scriptcraft.js
rename to src/main/js/lib/scriptcraft.js
index 929b7a7..a8d393f 100644
--- a/src/main/javascript/lib/scriptcraft.js
+++ b/src/main/js/lib/scriptcraft.js
@@ -625,7 +625,7 @@ function __onEnable (__engine, __plugin, __script)
         return result;
     };
 
-    plugins.autoload(jsPluginsRootDir);
+    plugins.autoload(jsPluginsRootDir,logger);
     /*
       wph 20140102 - warn if legacy 'craftbukkit/js-plugins' or 'craftbukkit/scriptcraft' directories are present
      */
diff --git a/src/main/javascript/lib/tabcomplete-jsp.js b/src/main/js/lib/tabcomplete-jsp.js
similarity index 100%
rename from src/main/javascript/lib/tabcomplete-jsp.js
rename to src/main/js/lib/tabcomplete-jsp.js
diff --git a/src/main/javascript/lib/tabcomplete.js b/src/main/js/lib/tabcomplete.js
similarity index 100%
rename from src/main/javascript/lib/tabcomplete.js
rename to src/main/js/lib/tabcomplete.js
diff --git a/src/main/javascript/modules/blocks.js b/src/main/js/modules/blocks.js
similarity index 100%
rename from src/main/javascript/modules/blocks.js
rename to src/main/js/modules/blocks.js
diff --git a/src/main/javascript/modules/fireworks/fireworks.js b/src/main/js/modules/fireworks/fireworks.js
similarity index 100%
rename from src/main/javascript/modules/fireworks/fireworks.js
rename to src/main/js/modules/fireworks/fireworks.js
diff --git a/src/main/javascript/modules/fireworks/package.json b/src/main/js/modules/fireworks/package.json
similarity index 100%
rename from src/main/javascript/modules/fireworks/package.json
rename to src/main/js/modules/fireworks/package.json
diff --git a/src/main/javascript/modules/http/package.json b/src/main/js/modules/http/package.json
similarity index 100%
rename from src/main/javascript/modules/http/package.json
rename to src/main/js/modules/http/package.json
diff --git a/src/main/javascript/modules/http/request.js b/src/main/js/modules/http/request.js
similarity index 100%
rename from src/main/javascript/modules/http/request.js
rename to src/main/js/modules/http/request.js
diff --git a/src/main/javascript/modules/minigames/scoreboard.js b/src/main/js/modules/minigames/scoreboard.js
similarity index 100%
rename from src/main/javascript/modules/minigames/scoreboard.js
rename to src/main/js/modules/minigames/scoreboard.js
diff --git a/src/main/javascript/modules/partial.js b/src/main/js/modules/partial.js
similarity index 100%
rename from src/main/javascript/modules/partial.js
rename to src/main/js/modules/partial.js
diff --git a/src/main/javascript/modules/sc-mqtt.js b/src/main/js/modules/sc-mqtt.js
similarity index 100%
rename from src/main/javascript/modules/sc-mqtt.js
rename to src/main/js/modules/sc-mqtt.js
diff --git a/src/main/javascript/modules/signs/menu.js b/src/main/js/modules/signs/menu.js
similarity index 100%
rename from src/main/javascript/modules/signs/menu.js
rename to src/main/js/modules/signs/menu.js
diff --git a/src/main/javascript/modules/signs/package.json b/src/main/js/modules/signs/package.json
similarity index 100%
rename from src/main/javascript/modules/signs/package.json
rename to src/main/js/modules/signs/package.json
diff --git a/src/main/javascript/modules/signs/signs.js b/src/main/js/modules/signs/signs.js
similarity index 100%
rename from src/main/javascript/modules/signs/signs.js
rename to src/main/js/modules/signs/signs.js
diff --git a/src/main/javascript/modules/underscore/package.json b/src/main/js/modules/underscore/package.json
similarity index 100%
rename from src/main/javascript/modules/underscore/package.json
rename to src/main/js/modules/underscore/package.json
diff --git a/src/main/javascript/modules/underscore/underscore.js b/src/main/js/modules/underscore/underscore.js
similarity index 100%
rename from src/main/javascript/modules/underscore/underscore.js
rename to src/main/js/modules/underscore/underscore.js
diff --git a/src/main/javascript/modules/utils/package.json b/src/main/js/modules/utils/package.json
similarity index 100%
rename from src/main/javascript/modules/utils/package.json
rename to src/main/js/modules/utils/package.json
diff --git a/src/main/javascript/modules/utils/string-exts.js b/src/main/js/modules/utils/string-exts.js
similarity index 100%
rename from src/main/javascript/modules/utils/string-exts.js
rename to src/main/js/modules/utils/string-exts.js
diff --git a/src/main/javascript/modules/utils/utils.js b/src/main/js/modules/utils/utils.js
similarity index 100%
rename from src/main/javascript/modules/utils/utils.js
rename to src/main/js/modules/utils/utils.js
diff --git a/src/main/javascript/plugins/alias/alias.js b/src/main/js/plugins/alias/alias.js
similarity index 100%
rename from src/main/javascript/plugins/alias/alias.js
rename to src/main/js/plugins/alias/alias.js
diff --git a/src/main/javascript/plugins/arrows.js b/src/main/js/plugins/arrows.js
similarity index 100%
rename from src/main/javascript/plugins/arrows.js
rename to src/main/js/plugins/arrows.js
diff --git a/src/main/javascript/plugins/chat/color.js b/src/main/js/plugins/chat/color.js
similarity index 100%
rename from src/main/javascript/plugins/chat/color.js
rename to src/main/js/plugins/chat/color.js
diff --git a/src/main/javascript/plugins/classroom/classroom.js b/src/main/js/plugins/classroom/classroom.js
similarity index 100%
rename from src/main/javascript/plugins/classroom/classroom.js
rename to src/main/js/plugins/classroom/classroom.js
diff --git a/src/main/javascript/plugins/commando/commando-test.js b/src/main/js/plugins/commando/commando-test.js
similarity index 100%
rename from src/main/javascript/plugins/commando/commando-test.js
rename to src/main/js/plugins/commando/commando-test.js
diff --git a/src/main/javascript/plugins/commando/commando.js b/src/main/js/plugins/commando/commando.js
similarity index 100%
rename from src/main/javascript/plugins/commando/commando.js
rename to src/main/js/plugins/commando/commando.js
diff --git a/src/main/javascript/plugins/drone/blocktype.js b/src/main/js/plugins/drone/blocktype.js
similarity index 100%
rename from src/main/javascript/plugins/drone/blocktype.js
rename to src/main/js/plugins/drone/blocktype.js
diff --git a/src/main/javascript/plugins/drone/contrib/castle.js b/src/main/js/plugins/drone/contrib/castle.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/castle.js
rename to src/main/js/plugins/drone/contrib/castle.js
diff --git a/src/main/javascript/plugins/drone/contrib/chessboard.js b/src/main/js/plugins/drone/contrib/chessboard.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/chessboard.js
rename to src/main/js/plugins/drone/contrib/chessboard.js
diff --git a/src/main/javascript/plugins/drone/contrib/cottage.js b/src/main/js/plugins/drone/contrib/cottage.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/cottage.js
rename to src/main/js/plugins/drone/contrib/cottage.js
diff --git a/src/main/javascript/plugins/drone/contrib/dancefloor.js b/src/main/js/plugins/drone/contrib/dancefloor.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/dancefloor.js
rename to src/main/js/plugins/drone/contrib/dancefloor.js
diff --git a/src/main/javascript/plugins/drone/contrib/fort.js b/src/main/js/plugins/drone/contrib/fort.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/fort.js
rename to src/main/js/plugins/drone/contrib/fort.js
diff --git a/src/main/javascript/plugins/drone/contrib/lcd-clock.js b/src/main/js/plugins/drone/contrib/lcd-clock.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/lcd-clock.js
rename to src/main/js/plugins/drone/contrib/lcd-clock.js
diff --git a/src/main/javascript/plugins/drone/contrib/logo.js b/src/main/js/plugins/drone/contrib/logo.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/logo.js
rename to src/main/js/plugins/drone/contrib/logo.js
diff --git a/src/main/javascript/plugins/drone/contrib/rainbow.js b/src/main/js/plugins/drone/contrib/rainbow.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/rainbow.js
rename to src/main/js/plugins/drone/contrib/rainbow.js
diff --git a/src/main/javascript/plugins/drone/contrib/rboxcall.js b/src/main/js/plugins/drone/contrib/rboxcall.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/rboxcall.js
rename to src/main/js/plugins/drone/contrib/rboxcall.js
diff --git a/src/main/javascript/plugins/drone/contrib/redstonewire.js b/src/main/js/plugins/drone/contrib/redstonewire.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/redstonewire.js
rename to src/main/js/plugins/drone/contrib/redstonewire.js
diff --git a/src/main/javascript/plugins/drone/contrib/skyscraper-example.js b/src/main/js/plugins/drone/contrib/skyscraper-example.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/skyscraper-example.js
rename to src/main/js/plugins/drone/contrib/skyscraper-example.js
diff --git a/src/main/javascript/plugins/drone/contrib/spiral_stairs.js b/src/main/js/plugins/drone/contrib/spiral_stairs.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/spiral_stairs.js
rename to src/main/js/plugins/drone/contrib/spiral_stairs.js
diff --git a/src/main/javascript/plugins/drone/contrib/streamer.js b/src/main/js/plugins/drone/contrib/streamer.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/streamer.js
rename to src/main/js/plugins/drone/contrib/streamer.js
diff --git a/src/main/javascript/plugins/drone/contrib/temple.js b/src/main/js/plugins/drone/contrib/temple.js
similarity index 100%
rename from src/main/javascript/plugins/drone/contrib/temple.js
rename to src/main/js/plugins/drone/contrib/temple.js
diff --git a/src/main/javascript/plugins/drone/drone-firework.js b/src/main/js/plugins/drone/drone-firework.js
similarity index 100%
rename from src/main/javascript/plugins/drone/drone-firework.js
rename to src/main/js/plugins/drone/drone-firework.js
diff --git a/src/main/javascript/plugins/drone/drone.js b/src/main/js/plugins/drone/drone.js
similarity index 100%
rename from src/main/javascript/plugins/drone/drone.js
rename to src/main/js/plugins/drone/drone.js
diff --git a/src/main/javascript/plugins/drone/sphere.js b/src/main/js/plugins/drone/sphere.js
similarity index 100%
rename from src/main/javascript/plugins/drone/sphere.js
rename to src/main/js/plugins/drone/sphere.js
diff --git a/src/main/javascript/plugins/drone/test.js b/src/main/js/plugins/drone/test.js
similarity index 100%
rename from src/main/javascript/plugins/drone/test.js
rename to src/main/js/plugins/drone/test.js
diff --git a/src/main/javascript/plugins/examples/example-1-hello-module.js b/src/main/js/plugins/examples/example-1-hello-module.js
similarity index 100%
rename from src/main/javascript/plugins/examples/example-1-hello-module.js
rename to src/main/js/plugins/examples/example-1-hello-module.js
diff --git a/src/main/javascript/plugins/examples/example-2-hello-command.js b/src/main/js/plugins/examples/example-2-hello-command.js
similarity index 100%
rename from src/main/javascript/plugins/examples/example-2-hello-command.js
rename to src/main/js/plugins/examples/example-2-hello-command.js
diff --git a/src/main/javascript/plugins/examples/example-3-hello-ops-only.js b/src/main/js/plugins/examples/example-3-hello-ops-only.js
similarity index 100%
rename from src/main/javascript/plugins/examples/example-3-hello-ops-only.js
rename to src/main/js/plugins/examples/example-3-hello-ops-only.js
diff --git a/src/main/javascript/plugins/examples/example-4-hello-parameters.js b/src/main/js/plugins/examples/example-4-hello-parameters.js
similarity index 100%
rename from src/main/javascript/plugins/examples/example-4-hello-parameters.js
rename to src/main/js/plugins/examples/example-4-hello-parameters.js
diff --git a/src/main/javascript/plugins/examples/example-5-hello-using-module.js b/src/main/js/plugins/examples/example-5-hello-using-module.js
similarity index 100%
rename from src/main/javascript/plugins/examples/example-5-hello-using-module.js
rename to src/main/js/plugins/examples/example-5-hello-using-module.js
diff --git a/src/main/javascript/plugins/examples/example-6-hello-player.js b/src/main/js/plugins/examples/example-6-hello-player.js
similarity index 100%
rename from src/main/javascript/plugins/examples/example-6-hello-player.js
rename to src/main/js/plugins/examples/example-6-hello-player.js
diff --git a/src/main/javascript/plugins/examples/example-7-hello-events.js b/src/main/js/plugins/examples/example-7-hello-events.js
similarity index 100%
rename from src/main/javascript/plugins/examples/example-7-hello-events.js
rename to src/main/js/plugins/examples/example-7-hello-events.js
diff --git a/src/main/javascript/plugins/homes/homes.js b/src/main/js/plugins/homes/homes.js
similarity index 100%
rename from src/main/javascript/plugins/homes/homes.js
rename to src/main/js/plugins/homes/homes.js
diff --git a/src/main/javascript/plugins/minigames/NumberGuess.js b/src/main/js/plugins/minigames/NumberGuess.js
similarity index 100%
rename from src/main/javascript/plugins/minigames/NumberGuess.js
rename to src/main/js/plugins/minigames/NumberGuess.js
diff --git a/src/main/javascript/plugins/minigames/SnowballFight.js b/src/main/js/plugins/minigames/SnowballFight.js
similarity index 100%
rename from src/main/javascript/plugins/minigames/SnowballFight.js
rename to src/main/js/plugins/minigames/SnowballFight.js
diff --git a/src/main/javascript/plugins/minigames/cow-clicker.js b/src/main/js/plugins/minigames/cow-clicker.js
similarity index 100%
rename from src/main/javascript/plugins/minigames/cow-clicker.js
rename to src/main/js/plugins/minigames/cow-clicker.js
diff --git a/src/main/javascript/plugins/signs/examples.js b/src/main/js/plugins/signs/examples.js
similarity index 100%
rename from src/main/javascript/plugins/signs/examples.js
rename to src/main/js/plugins/signs/examples.js
diff --git a/src/main/javascript/plugins/spawn.js b/src/main/js/plugins/spawn.js
similarity index 100%
rename from src/main/javascript/plugins/spawn.js
rename to src/main/js/plugins/spawn.js
diff --git a/src/main/javascript/readme.md b/src/main/js/readme.md
similarity index 100%
rename from src/main/javascript/readme.md
rename to src/main/js/readme.md