Web and Wrappers-JQuery with new namespaces

According to naming conventions in wiki, the new namespaces are
 - amber/web
 - amber/jquery

contrib/local.amd.json

@@ -1,6 +1,15 @@
 {
     "paths": {
-        "amber-contrib-web": "src",
-        "amber-contrib-jquery": "src"
+        "amber/web": "src",
+        "amber/jquery": "src"
+    },
+  "map": {
+    "*": {
+      "00comment": "These are backward compatibility pointers.",
+      "amber-contrib-jquery/Wrappers-JQuery": "amber/jquery/Wrappers-JQuery",
+      "amber-contrib-web/Web": "amber/web/Web",
+      "amber_core/Web": "amber/web/Web",
+      "amber_core/Canvas": "amber/web/Web"
     }
+  }
 }

contrib/src/Web.js

@@ -1,6 +1,6 @@
-define("amber-contrib-web/Web", ["amber/boot"
+define("amber/web/Web", ["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
-, "amber-contrib-jquery/Wrappers-JQuery"
+, "amber/jquery/Wrappers-JQuery"
 //>>excludeEnd("imports");
 , "amber_core/Kernel-Objects", "amber_core/Platform-Services", "amber_core/Kernel-Methods", "amber_core/Kernel-Collections"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
@@ -10,8 +10,8 @@ define("amber-contrib-web/Web", ["amber/boot"
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('Web');
 $core.packages["Web"].innerEval = function (expr) { return eval(expr); };
-$core.packages["Web"].imports = ["amber-contrib-jquery/Wrappers-JQuery"];
-$core.packages["Web"].transport = {"type":"amd","amdNamespace":"amber-contrib-web"};
+$core.packages["Web"].imports = ["amber/jquery/Wrappers-JQuery"];
+$core.packages["Web"].transport = {"type":"amd","amdNamespace":"amber/web"};
 
 $core.addClass('HTMLCanvas', $globals.Object, ['root'], 'Web');
 //>>excludeStart("ide", pragmas.excludeIdeData);

contrib/src/Web.st

@@ -1,5 +1,5 @@
 Smalltalk createPackage: 'Web'!
-(Smalltalk packageAt: 'Web') imports: {'amber-contrib-jquery/Wrappers-JQuery'}!
+(Smalltalk packageAt: 'Web') imports: {'amber/jquery/Wrappers-JQuery'}!
 Object subclass: #HTMLCanvas
 	instanceVariableNames: 'root'
 	package: 'Web'!

contrib/src/Wrappers-JQuery.js

@@ -1,4 +1,4 @@
-define("amber-contrib-jquery/Wrappers-JQuery", ["amber/boot"
+define("amber/jquery/Wrappers-JQuery", ["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
 , "jquery"
 //>>excludeEnd("imports");
@@ -11,7 +11,7 @@ var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('Wrappers-JQuery');
 $core.packages["Wrappers-JQuery"].innerEval = function (expr) { return eval(expr); };
 $core.packages["Wrappers-JQuery"].imports = ["jQuery=jquery"];
-$core.packages["Wrappers-JQuery"].transport = {"type":"amd","amdNamespace":"amber-contrib-jquery"};
+$core.packages["Wrappers-JQuery"].transport = {"type":"amd","amdNamespace":"amber/jquery"};
 
 $core.addClass('JQuery', $globals.Object, [], 'Wrappers-JQuery');
 

internal/index.html

@@ -16,7 +16,7 @@
 <script type='text/javascript'>
 //    require.config({baseUrl: '..'});
     require(
-        ["amber/devel", "amber-attic/IDE", "amber-contrib-web/Web", "amber-attic/Benchfib", "helios/all", "amber_cli/AmberCli"],
+        ["amber/devel", "amber-attic/IDE", "amber/web/Web", "amber-attic/Benchfib", "helios/all", "amber_cli/AmberCli"],
         function (amber) {
             amber.initialize({'transport.defaultAmdNamespace': "amber_core"});
         }

local.amd.json

@@ -11,9 +11,7 @@
     "map": {
         "*": {
             "00comment": "These are backward compatibility pointers.",
-            "amber_core/Kernel-ImportExport": "amber_core/Platform-ImportExport",
-            "amber_core/Web": "amber-contrib-web/Web",
-            "amber_core/Canvas": "amber-contrib-web/Web"
+            "amber_core/Kernel-ImportExport": "amber_core/Platform-ImportExport"
         }
     }
 }