diff --git a/src/platform/emscripten/lol_shell.html b/src/platform/emscripten/lol_shell.html
index 98578851..474d3552 100644
--- a/src/platform/emscripten/lol_shell.html
+++ b/src/platform/emscripten/lol_shell.html
@@ -38,7 +38,7 @@ canvas.emscripten
 </head>
 
 <body>
-    <div class="emscripten_border">
+    <div class="emscripten_border" id="id_div_embed_data">
         <canvas class="emscripten" id="id_cvas_render" oncontextmenu="event.preventDefault()"></canvas>
     </div>
 
@@ -172,6 +172,7 @@ canvas.emscripten
 <!-- -->
 
 <script type='text/javascript'>
+    //This call NEEDS TO BE after the .js include, because "cwrap" is set in it.
     Module.do_wrapup();
 
     //Parent communication datas
diff --git a/test/naclloading.js b/test/javascript/naclloading.js
similarity index 100%
rename from test/naclloading.js
rename to test/javascript/naclloading.js
diff --git a/test/progressstatus.js b/test/javascript/progressstatus.js
similarity index 100%
rename from test/progressstatus.js
rename to test/javascript/progressstatus.js
diff --git a/test/typedictionnary.js b/test/javascript/typedictionnary.js
similarity index 100%
rename from test/typedictionnary.js
rename to test/javascript/typedictionnary.js
diff --git a/test/utils.js b/test/javascript/utils.js
similarity index 100%
rename from test/utils.js
rename to test/javascript/utils.js
diff --git a/test/meshviewer.em.html b/test/meshviewer.em.html
index f026c3d4..772a1f5a 100644
--- a/test/meshviewer.em.html
+++ b/test/meshviewer.em.html
@@ -142,7 +142,7 @@ canvas.emscripten
                             Module.setStatus('All downloads complete.', 1, 1);
                     },
         //IMPORTANT : This is the C -> Javascript wraping, add your functions list here.
-        wrapup_list: [ {src_obj: null, func_name: 'DoSendMessage', c_func_name: 'C_Send', return_var: 'number', args: ['number', 'string'] } ],
+        wrapup_list: [ {src_obj: null, func_name: 'DoSendMessage', c_func_name: 'C_Send', return_var: 'number', args: ['string'] } ],
         do_wrapup:  function()
                     {
                         for (var i = 0; i < this.wrapup_list.length; i++)
@@ -158,7 +158,7 @@ canvas.emscripten
         //Module <-> Page communication setup
         SendMessage:function(message)
                     {
-                        this.DoSendMessage(0, message);
+                        this.DoSendMessage(message);
                     },
         ModuleSendMessage:function(message)
                     {
diff --git a/test/meshviewer.index.html b/test/meshviewer.index.html
index 09649f7c..84fa6989 100644
--- a/test/meshviewer.index.html
+++ b/test/meshviewer.index.html
@@ -127,19 +127,19 @@ function machinchose() { return 'test machin '; }
     function IsUsingNaCl()          { return window.chrome; }
 </script>
 
-<script src="./utils.js"></script>
-<script src="./progressstatus.js"></script>
+<script src="./javascript/utils.js"></script>
+<script src="./javascript/progressstatus.js"></script>
 <script type="text/javascript">
     //Used by typedictionnary.js
     function GetCmdDictionnary()    { return CodeDictionnary[g_code_id]; }
     g_code_id = 1;
 </script>
-<script src="./typedictionnary.js"></script>
+<script src="./javascript/typedictionnary.js"></script>
 <!-- Init Scene setup dictionnary -->
 <script type="text/javascript">
     CodeDictionnary[g_code_id--] = new TypeDictionnary("SceneSetup");
 </script>
-<script src="./scenesetup.js"></script>
+<script src="./scenesetupdictionnary.js"></script>
 <!-- Init Easy mesh dictionnary -->
 <script type="text/javascript">
     CodeDictionnary[g_code_id] = new TypeDictionnary("EasyMesh");
@@ -208,7 +208,7 @@ function machinchose() { return 'test machin '; }
         //NaCl Specific
         if (IsUsingNaCl())
         {
-            DynLoadFile("naclloading.js");
+            DynLoadFile("./javascript/naclloading.js");
             g_frame_embed.src = 'meshviewer.nacl.html';
         }
         else
diff --git a/test/meshviewer.vcxproj b/test/meshviewer.vcxproj
index b3c01ad1..978cae00 100644
--- a/test/meshviewer.vcxproj
+++ b/test/meshviewer.vcxproj
@@ -85,19 +85,19 @@
     <None Include="easymeshdictionnary.js">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
-    <None Include="naclloading.js">
+    <None Include="scenesetupdictionnary.js">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
-    <None Include="progressstatus.js">
+    <None Include="javascript/naclloading.js">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
-    <None Include="utils.js">
+    <None Include="javascript/progressstatus.js">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
-    <None Include="scenesetupdictionnary.js">
+    <None Include="javascript/utils.js">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
-    <None Include="typedictionnary.js">
+    <None Include="javascript/typedictionnary.js">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     </None>
   </ItemGroup>
