diff --git a/sandbox/embed_selfhost_fullscreen.html b/sandbox/embed_selfhost_fullscreen.html
index cbd6f19..48e94ce 100644
--- a/sandbox/embed_selfhost_fullscreen.html
+++ b/sandbox/embed_selfhost_fullscreen.html
@@ -9,51 +9,51 @@
     
     <script type="text/javascript" src="../../libs/three.min-126.js"></script>
 	<!-- importer start -->
-	<script type="text/javascript" src="../../source/core/core.js"></script>
-	<script type="text/javascript" src="../../source/core/taskrunner.js"></script>
-	<script type="text/javascript" src="../../source/geometry/geometry.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord2d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord3d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/matrix.js"></script>
-	<script type="text/javascript" src="../../source/geometry/transformation.js"></script>
-	<script type="text/javascript" src="../../source/geometry/tween.js"></script>
-	<script type="text/javascript" src="../../source/io/binaryreader.js"></script>
-	<script type="text/javascript" src="../../source/io/binarywriter.js"></script>
-	<script type="text/javascript" src="../../source/io/textwriter.js"></script>
-	<script type="text/javascript" src="../../source/io/bufferutils.js"></script>
-	<script type="text/javascript" src="../../source/io/fileutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelentities.js"></script>
-	<script type="text/javascript" src="../../source/model/mesh.js"></script>
-	<script type="text/javascript" src="../../source/model/meshbuffer.js"></script>
-	<script type="text/javascript" src="../../source/model/model.js"></script>
-	<script type="text/javascript" src="../../source/model/modelutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelfinalization.js"></script>
-	<script type="text/javascript" src="../../source/import/importerutils.js"></script>
-	<script type="text/javascript" src="../../source/import/importerbase.js"></script>
-	<script type="text/javascript" src="../../source/import/importerobj.js"></script>
-	<script type="text/javascript" src="../../source/import/importerstl.js"></script>
-	<script type="text/javascript" src="../../source/import/importeroff.js"></script>
-	<script type="text/javascript" src="../../source/import/importerply.js"></script>
-	<script type="text/javascript" src="../../source/import/importer3ds.js"></script>
-	<script type="text/javascript" src="../../source/import/importergltf.js"></script>
-	<script type="text/javascript" src="../../source/import/importer.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterutils.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterbase.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterobj.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterstl.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterply.js"></script>
-	<script type="text/javascript" src="../../source/export/exporteroff.js"></script>
-	<script type="text/javascript" src="../../source/export/exportergltf.js"></script>
-	<script type="text/javascript" src="../../source/export/exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.importer.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.converter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.model.loader.js"></script>
-	<script type="text/javascript" src="../../source/parameters/parameterlist.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domutils.js"></script>
-	<script type="text/javascript" src="../../source/viewer/navigation.js"></script>
-	<script type="text/javascript" src="../../source/viewer/viewer.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domviewer.js"></script>
+	<script type="text/javascript" src="../source/core/core.js"></script>
+	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
+	<script type="text/javascript" src="../source/geometry/geometry.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord2d.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord3d.js"></script>
+	<script type="text/javascript" src="../source/geometry/matrix.js"></script>
+	<script type="text/javascript" src="../source/geometry/transformation.js"></script>
+	<script type="text/javascript" src="../source/geometry/tween.js"></script>
+	<script type="text/javascript" src="../source/io/binaryreader.js"></script>
+	<script type="text/javascript" src="../source/io/binarywriter.js"></script>
+	<script type="text/javascript" src="../source/io/textwriter.js"></script>
+	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
+	<script type="text/javascript" src="../source/io/fileutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelentities.js"></script>
+	<script type="text/javascript" src="../source/model/mesh.js"></script>
+	<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
+	<script type="text/javascript" src="../source/model/model.js"></script>
+	<script type="text/javascript" src="../source/model/modelutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelfinalization.js"></script>
+	<script type="text/javascript" src="../source/import/importerutils.js"></script>
+	<script type="text/javascript" src="../source/import/importerbase.js"></script>
+	<script type="text/javascript" src="../source/import/importerobj.js"></script>
+	<script type="text/javascript" src="../source/import/importerstl.js"></script>
+	<script type="text/javascript" src="../source/import/importeroff.js"></script>
+	<script type="text/javascript" src="../source/import/importerply.js"></script>
+	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
+	<script type="text/javascript" src="../source/import/importergltf.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
+	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
+	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
+	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
+	<script type="text/javascript" src="../source/export/exporterply.js"></script>
+	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
+	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
+	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.importer.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.exporter.js"></script>
+	<script type="text/javascript" src="../source/external/three.converter.js"></script>
+	<script type="text/javascript" src="../source/external/three.model.loader.js"></script>
+	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
+	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
+	<script type="text/javascript" src="../source/viewer/navigation.js"></script>
+	<script type="text/javascript" src="../source/viewer/viewer.js"></script>
+	<script type="text/javascript" src="../source/viewer/domviewer.js"></script>
 	<!-- importer end -->
 
     <script type='text/javascript'>
diff --git a/sandbox/embed_selfhost_multiple.html b/sandbox/embed_selfhost_multiple.html
index c4d18c7..06c3125 100644
--- a/sandbox/embed_selfhost_multiple.html
+++ b/sandbox/embed_selfhost_multiple.html
@@ -11,51 +11,51 @@
     <script type="text/javascript" src="../../libs/three.min-126.js"></script>
 
 	<!-- importer start -->
-	<script type="text/javascript" src="../../source/core/core.js"></script>
-	<script type="text/javascript" src="../../source/core/taskrunner.js"></script>
-	<script type="text/javascript" src="../../source/geometry/geometry.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord2d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord3d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/matrix.js"></script>
-	<script type="text/javascript" src="../../source/geometry/transformation.js"></script>
-	<script type="text/javascript" src="../../source/geometry/tween.js"></script>
-	<script type="text/javascript" src="../../source/io/binaryreader.js"></script>
-	<script type="text/javascript" src="../../source/io/binarywriter.js"></script>
-	<script type="text/javascript" src="../../source/io/textwriter.js"></script>
-	<script type="text/javascript" src="../../source/io/bufferutils.js"></script>
-	<script type="text/javascript" src="../../source/io/fileutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelentities.js"></script>
-	<script type="text/javascript" src="../../source/model/mesh.js"></script>
-	<script type="text/javascript" src="../../source/model/meshbuffer.js"></script>
-	<script type="text/javascript" src="../../source/model/model.js"></script>
-	<script type="text/javascript" src="../../source/model/modelutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelfinalization.js"></script>
-	<script type="text/javascript" src="../../source/import/importerutils.js"></script>
-	<script type="text/javascript" src="../../source/import/importerbase.js"></script>
-	<script type="text/javascript" src="../../source/import/importerobj.js"></script>
-	<script type="text/javascript" src="../../source/import/importerstl.js"></script>
-	<script type="text/javascript" src="../../source/import/importeroff.js"></script>
-	<script type="text/javascript" src="../../source/import/importerply.js"></script>
-	<script type="text/javascript" src="../../source/import/importer3ds.js"></script>
-	<script type="text/javascript" src="../../source/import/importergltf.js"></script>
-	<script type="text/javascript" src="../../source/import/importer.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterutils.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterbase.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterobj.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterstl.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterply.js"></script>
-	<script type="text/javascript" src="../../source/export/exporteroff.js"></script>
-	<script type="text/javascript" src="../../source/export/exportergltf.js"></script>
-	<script type="text/javascript" src="../../source/export/exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.importer.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.converter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.model.loader.js"></script>
-	<script type="text/javascript" src="../../source/parameters/parameterlist.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domutils.js"></script>
-	<script type="text/javascript" src="../../source/viewer/navigation.js"></script>
-	<script type="text/javascript" src="../../source/viewer/viewer.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domviewer.js"></script>
+	<script type="text/javascript" src="../source/core/core.js"></script>
+	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
+	<script type="text/javascript" src="../source/geometry/geometry.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord2d.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord3d.js"></script>
+	<script type="text/javascript" src="../source/geometry/matrix.js"></script>
+	<script type="text/javascript" src="../source/geometry/transformation.js"></script>
+	<script type="text/javascript" src="../source/geometry/tween.js"></script>
+	<script type="text/javascript" src="../source/io/binaryreader.js"></script>
+	<script type="text/javascript" src="../source/io/binarywriter.js"></script>
+	<script type="text/javascript" src="../source/io/textwriter.js"></script>
+	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
+	<script type="text/javascript" src="../source/io/fileutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelentities.js"></script>
+	<script type="text/javascript" src="../source/model/mesh.js"></script>
+	<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
+	<script type="text/javascript" src="../source/model/model.js"></script>
+	<script type="text/javascript" src="../source/model/modelutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelfinalization.js"></script>
+	<script type="text/javascript" src="../source/import/importerutils.js"></script>
+	<script type="text/javascript" src="../source/import/importerbase.js"></script>
+	<script type="text/javascript" src="../source/import/importerobj.js"></script>
+	<script type="text/javascript" src="../source/import/importerstl.js"></script>
+	<script type="text/javascript" src="../source/import/importeroff.js"></script>
+	<script type="text/javascript" src="../source/import/importerply.js"></script>
+	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
+	<script type="text/javascript" src="../source/import/importergltf.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
+	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
+	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
+	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
+	<script type="text/javascript" src="../source/export/exporterply.js"></script>
+	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
+	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
+	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.importer.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.exporter.js"></script>
+	<script type="text/javascript" src="../source/external/three.converter.js"></script>
+	<script type="text/javascript" src="../source/external/three.model.loader.js"></script>
+	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
+	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
+	<script type="text/javascript" src="../source/viewer/navigation.js"></script>
+	<script type="text/javascript" src="../source/viewer/viewer.js"></script>
+	<script type="text/javascript" src="../source/viewer/domviewer.js"></script>
 	<!-- importer end -->
 
     <script type='text/javascript'>
diff --git a/sandbox/embed_selfhost_single.html b/sandbox/embed_selfhost_single.html
index 29276c2..c1d5eff 100644
--- a/sandbox/embed_selfhost_single.html
+++ b/sandbox/embed_selfhost_single.html
@@ -9,51 +9,51 @@
     
     <script type="text/javascript" src="../../libs/three.min-126.js"></script>
 	<!-- importer start -->
-	<script type="text/javascript" src="../../source/core/core.js"></script>
-	<script type="text/javascript" src="../../source/core/taskrunner.js"></script>
-	<script type="text/javascript" src="../../source/geometry/geometry.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord2d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord3d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/matrix.js"></script>
-	<script type="text/javascript" src="../../source/geometry/transformation.js"></script>
-	<script type="text/javascript" src="../../source/geometry/tween.js"></script>
-	<script type="text/javascript" src="../../source/io/binaryreader.js"></script>
-	<script type="text/javascript" src="../../source/io/binarywriter.js"></script>
-	<script type="text/javascript" src="../../source/io/textwriter.js"></script>
-	<script type="text/javascript" src="../../source/io/bufferutils.js"></script>
-	<script type="text/javascript" src="../../source/io/fileutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelentities.js"></script>
-	<script type="text/javascript" src="../../source/model/mesh.js"></script>
-	<script type="text/javascript" src="../../source/model/meshbuffer.js"></script>
-	<script type="text/javascript" src="../../source/model/model.js"></script>
-	<script type="text/javascript" src="../../source/model/modelutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelfinalization.js"></script>
-	<script type="text/javascript" src="../../source/import/importerutils.js"></script>
-	<script type="text/javascript" src="../../source/import/importerbase.js"></script>
-	<script type="text/javascript" src="../../source/import/importerobj.js"></script>
-	<script type="text/javascript" src="../../source/import/importerstl.js"></script>
-	<script type="text/javascript" src="../../source/import/importeroff.js"></script>
-	<script type="text/javascript" src="../../source/import/importerply.js"></script>
-	<script type="text/javascript" src="../../source/import/importer3ds.js"></script>
-	<script type="text/javascript" src="../../source/import/importergltf.js"></script>
-	<script type="text/javascript" src="../../source/import/importer.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterutils.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterbase.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterobj.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterstl.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterply.js"></script>
-	<script type="text/javascript" src="../../source/export/exporteroff.js"></script>
-	<script type="text/javascript" src="../../source/export/exportergltf.js"></script>
-	<script type="text/javascript" src="../../source/export/exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.importer.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.converter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.model.loader.js"></script>
-	<script type="text/javascript" src="../../source/parameters/parameterlist.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domutils.js"></script>
-	<script type="text/javascript" src="../../source/viewer/navigation.js"></script>
-	<script type="text/javascript" src="../../source/viewer/viewer.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domviewer.js"></script>
+	<script type="text/javascript" src="../source/core/core.js"></script>
+	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
+	<script type="text/javascript" src="../source/geometry/geometry.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord2d.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord3d.js"></script>
+	<script type="text/javascript" src="../source/geometry/matrix.js"></script>
+	<script type="text/javascript" src="../source/geometry/transformation.js"></script>
+	<script type="text/javascript" src="../source/geometry/tween.js"></script>
+	<script type="text/javascript" src="../source/io/binaryreader.js"></script>
+	<script type="text/javascript" src="../source/io/binarywriter.js"></script>
+	<script type="text/javascript" src="../source/io/textwriter.js"></script>
+	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
+	<script type="text/javascript" src="../source/io/fileutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelentities.js"></script>
+	<script type="text/javascript" src="../source/model/mesh.js"></script>
+	<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
+	<script type="text/javascript" src="../source/model/model.js"></script>
+	<script type="text/javascript" src="../source/model/modelutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelfinalization.js"></script>
+	<script type="text/javascript" src="../source/import/importerutils.js"></script>
+	<script type="text/javascript" src="../source/import/importerbase.js"></script>
+	<script type="text/javascript" src="../source/import/importerobj.js"></script>
+	<script type="text/javascript" src="../source/import/importerstl.js"></script>
+	<script type="text/javascript" src="../source/import/importeroff.js"></script>
+	<script type="text/javascript" src="../source/import/importerply.js"></script>
+	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
+	<script type="text/javascript" src="../source/import/importergltf.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
+	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
+	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
+	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
+	<script type="text/javascript" src="../source/export/exporterply.js"></script>
+	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
+	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
+	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.importer.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.exporter.js"></script>
+	<script type="text/javascript" src="../source/external/three.converter.js"></script>
+	<script type="text/javascript" src="../source/external/three.model.loader.js"></script>
+	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
+	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
+	<script type="text/javascript" src="../source/viewer/navigation.js"></script>
+	<script type="text/javascript" src="../source/viewer/viewer.js"></script>
+	<script type="text/javascript" src="../source/viewer/domviewer.js"></script>
 	<!-- importer end -->
     <script type='text/javascript'>
         OV.Init3DViewerElements ();
diff --git a/sandbox/embed_selfhost_single_scroll.html b/sandbox/embed_selfhost_single_scroll.html
index ba3bdb0..59ca013 100644
--- a/sandbox/embed_selfhost_single_scroll.html
+++ b/sandbox/embed_selfhost_single_scroll.html
@@ -9,51 +9,51 @@
     
     <script type="text/javascript" src="../../libs/three.min-126.js"></script>
 	<!-- importer start -->
-	<script type="text/javascript" src="../../source/core/core.js"></script>
-	<script type="text/javascript" src="../../source/core/taskrunner.js"></script>
-	<script type="text/javascript" src="../../source/geometry/geometry.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord2d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/coord3d.js"></script>
-	<script type="text/javascript" src="../../source/geometry/matrix.js"></script>
-	<script type="text/javascript" src="../../source/geometry/transformation.js"></script>
-	<script type="text/javascript" src="../../source/geometry/tween.js"></script>
-	<script type="text/javascript" src="../../source/io/binaryreader.js"></script>
-	<script type="text/javascript" src="../../source/io/binarywriter.js"></script>
-	<script type="text/javascript" src="../../source/io/textwriter.js"></script>
-	<script type="text/javascript" src="../../source/io/bufferutils.js"></script>
-	<script type="text/javascript" src="../../source/io/fileutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelentities.js"></script>
-	<script type="text/javascript" src="../../source/model/mesh.js"></script>
-	<script type="text/javascript" src="../../source/model/meshbuffer.js"></script>
-	<script type="text/javascript" src="../../source/model/model.js"></script>
-	<script type="text/javascript" src="../../source/model/modelutils.js"></script>
-	<script type="text/javascript" src="../../source/model/modelfinalization.js"></script>
-	<script type="text/javascript" src="../../source/import/importerutils.js"></script>
-	<script type="text/javascript" src="../../source/import/importerbase.js"></script>
-	<script type="text/javascript" src="../../source/import/importerobj.js"></script>
-	<script type="text/javascript" src="../../source/import/importerstl.js"></script>
-	<script type="text/javascript" src="../../source/import/importeroff.js"></script>
-	<script type="text/javascript" src="../../source/import/importerply.js"></script>
-	<script type="text/javascript" src="../../source/import/importer3ds.js"></script>
-	<script type="text/javascript" src="../../source/import/importergltf.js"></script>
-	<script type="text/javascript" src="../../source/import/importer.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterutils.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterbase.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterobj.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterstl.js"></script>
-	<script type="text/javascript" src="../../source/export/exporterply.js"></script>
-	<script type="text/javascript" src="../../source/export/exporteroff.js"></script>
-	<script type="text/javascript" src="../../source/export/exportergltf.js"></script>
-	<script type="text/javascript" src="../../source/export/exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.importer.js"></script>
-	<script type="text/javascript" src="../../source/external/rhino.exporter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.converter.js"></script>
-	<script type="text/javascript" src="../../source/external/three.model.loader.js"></script>
-	<script type="text/javascript" src="../../source/parameters/parameterlist.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domutils.js"></script>
-	<script type="text/javascript" src="../../source/viewer/navigation.js"></script>
-	<script type="text/javascript" src="../../source/viewer/viewer.js"></script>
-	<script type="text/javascript" src="../../source/viewer/domviewer.js"></script>
+	<script type="text/javascript" src="../source/core/core.js"></script>
+	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
+	<script type="text/javascript" src="../source/geometry/geometry.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord2d.js"></script>
+	<script type="text/javascript" src="../source/geometry/coord3d.js"></script>
+	<script type="text/javascript" src="../source/geometry/matrix.js"></script>
+	<script type="text/javascript" src="../source/geometry/transformation.js"></script>
+	<script type="text/javascript" src="../source/geometry/tween.js"></script>
+	<script type="text/javascript" src="../source/io/binaryreader.js"></script>
+	<script type="text/javascript" src="../source/io/binarywriter.js"></script>
+	<script type="text/javascript" src="../source/io/textwriter.js"></script>
+	<script type="text/javascript" src="../source/io/bufferutils.js"></script>
+	<script type="text/javascript" src="../source/io/fileutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelentities.js"></script>
+	<script type="text/javascript" src="../source/model/mesh.js"></script>
+	<script type="text/javascript" src="../source/model/meshbuffer.js"></script>
+	<script type="text/javascript" src="../source/model/model.js"></script>
+	<script type="text/javascript" src="../source/model/modelutils.js"></script>
+	<script type="text/javascript" src="../source/model/modelfinalization.js"></script>
+	<script type="text/javascript" src="../source/import/importerutils.js"></script>
+	<script type="text/javascript" src="../source/import/importerbase.js"></script>
+	<script type="text/javascript" src="../source/import/importerobj.js"></script>
+	<script type="text/javascript" src="../source/import/importerstl.js"></script>
+	<script type="text/javascript" src="../source/import/importeroff.js"></script>
+	<script type="text/javascript" src="../source/import/importerply.js"></script>
+	<script type="text/javascript" src="../source/import/importer3ds.js"></script>
+	<script type="text/javascript" src="../source/import/importergltf.js"></script>
+	<script type="text/javascript" src="../source/import/importer.js"></script>
+	<script type="text/javascript" src="../source/export/exporterutils.js"></script>
+	<script type="text/javascript" src="../source/export/exporterbase.js"></script>
+	<script type="text/javascript" src="../source/export/exporterobj.js"></script>
+	<script type="text/javascript" src="../source/export/exporterstl.js"></script>
+	<script type="text/javascript" src="../source/export/exporterply.js"></script>
+	<script type="text/javascript" src="../source/export/exporteroff.js"></script>
+	<script type="text/javascript" src="../source/export/exportergltf.js"></script>
+	<script type="text/javascript" src="../source/export/exporter.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.importer.js"></script>
+	<script type="text/javascript" src="../source/external/rhino.exporter.js"></script>
+	<script type="text/javascript" src="../source/external/three.converter.js"></script>
+	<script type="text/javascript" src="../source/external/three.model.loader.js"></script>
+	<script type="text/javascript" src="../source/parameters/parameterlist.js"></script>
+	<script type="text/javascript" src="../source/viewer/domutils.js"></script>
+	<script type="text/javascript" src="../source/viewer/navigation.js"></script>
+	<script type="text/javascript" src="../source/viewer/viewer.js"></script>
+	<script type="text/javascript" src="../source/viewer/domviewer.js"></script>
 	<!-- importer end -->
     <script type='text/javascript'>
         OV.Init3DViewerElements ();
diff --git a/tools/update_includes.py b/tools/update_includes.py
index 307c7f4..e032b03 100644
--- a/tools/update_includes.py
+++ b/tools/update_includes.py
@@ -35,12 +35,12 @@ def Main (argv):
 		replacer.WriteToFile (htmlFilePath)
 
 	sandboxFolder = os.path.join (rootDir, 'sandbox')
-	for htmlFileName in sandboxFolder:
+	for htmlFileName in os.listdir (sandboxFolder):
 		if os.path.splitext (htmlFileName)[1] != '.html':
 			continue
 		htmlFilePath = os.path.join (sandboxFolder, htmlFileName)
 		replacer = Tools.TokenReplacer (htmlFilePath, True)
-		importerFiles = Tools.CreateFileList (config['importer_files'], 'source/', '../../source/')
+		importerFiles = Tools.CreateFileList (config['importer_files'], 'source/', '../source/')
 		replacer.ReplaceTokenFileLinks ('<!-- importer start -->', '<!-- importer end -->', importerFiles, None)
 		replacer.WriteToFile (htmlFilePath)
 		
diff --git a/website/embed.html b/website/embed.html
index 473a291..dba3b74 100644
--- a/website/embed.html
+++ b/website/embed.html
@@ -73,7 +73,7 @@
 	<script type="text/javascript" src="o3dv/dialogs.js"></script>
 	<script type="text/javascript" src="o3dv/exportdialog.js"></script>
 	<script type="text/javascript" src="o3dv/modeldata.js"></script>
-	<script type="text/javascript" src="o3dv/info.js"></script>
+	<script type="text/javascript" src="o3dv/info2.js"></script>
 	<script type="text/javascript" src="o3dv/menu.js"></script>
 	<script type="text/javascript" src="o3dv/hashhandler.js"></script>
 	<link rel="stylesheet" type="text/css" href="o3dv/website.css">
diff --git a/website/index.html b/website/index.html
index 12d81c2..32f5c3d 100644
--- a/website/index.html
+++ b/website/index.html
@@ -73,7 +73,7 @@
 	<script type="text/javascript" src="o3dv/dialogs.js"></script>
 	<script type="text/javascript" src="o3dv/exportdialog.js"></script>
 	<script type="text/javascript" src="o3dv/modeldata.js"></script>
-	<script type="text/javascript" src="o3dv/info.js"></script>
+	<script type="text/javascript" src="o3dv/info2.js"></script>
 	<script type="text/javascript" src="o3dv/menu.js"></script>
 	<script type="text/javascript" src="o3dv/hashhandler.js"></script>
 	<link rel="stylesheet" type="text/css" href="o3dv/website.css">