diff --git a/tools/config.json b/tools/config.json
index f88ca8c..eb754d1 100644
--- a/tools/config.json
+++ b/tools/config.json
@@ -63,30 +63,30 @@
 		"source/viewer/domviewer.js"
 	],
 	"website_files_js" : [
-		"website/o3dv/featureset.js",
-		"website/o3dv/eventhandler.js",
-		"website/o3dv/utils.js",
-		"website/o3dv/cookies.js",
-		"website/o3dv/toolbar.js",
-		"website/o3dv/treeview.js",
-		"website/o3dv/modal.js",
-		"website/o3dv/dialogs.js",
-		"website/o3dv/openurldialog.js",
-		"website/o3dv/exportdialog.js",
-		"website/o3dv/sharingdialog.js",
-		"website/o3dv/cookiedialog.js",
-		"website/o3dv/modeldata.js",
-		"website/o3dv/navigator.js",
-		"website/o3dv/sidebarpanel.js",
-		"website/o3dv/detailssidebarpanel.js",
-		"website/o3dv/settingssidebarpanel.js",
-		"website/o3dv/sidebar.js",
-		"website/o3dv/hashhandler.js",
-		"website/o3dv/loader.js",
-		"website/o3dv/website.js",
-		"website/o3dv/embed.js"
+		"website/o3dv/js/featureset.js",
+		"website/o3dv/js/eventhandler.js",
+		"website/o3dv/js/utils.js",
+		"website/o3dv/js/cookies.js",
+		"website/o3dv/js/toolbar.js",
+		"website/o3dv/js/treeview.js",
+		"website/o3dv/js/modal.js",
+		"website/o3dv/js/dialogs.js",
+		"website/o3dv/js/openurldialog.js",
+		"website/o3dv/js/exportdialog.js",
+		"website/o3dv/js/sharingdialog.js",
+		"website/o3dv/js/cookiedialog.js",
+		"website/o3dv/js/modeldata.js",
+		"website/o3dv/js/navigator.js",
+		"website/o3dv/js/sidebarpanel.js",
+		"website/o3dv/js/detailssidebarpanel.js",
+		"website/o3dv/js/settingssidebarpanel.js",
+		"website/o3dv/js/sidebar.js",
+		"website/o3dv/js/hashhandler.js",
+		"website/o3dv/js/loader.js",
+		"website/o3dv/js/website.js",
+		"website/o3dv/js/embed.js"
 	],
 	"website_files_css" : [
-		"website/o3dv/website.css"
+		"website/o3dv/css/website.css"
 	]
 }
diff --git a/website/embed.html b/website/embed.html
index 47f98e6..5471e56 100644
--- a/website/embed.html
+++ b/website/embed.html
@@ -77,29 +77,29 @@
 	<!-- engine end -->
 	
 	<!-- website start -->
-	<link rel="stylesheet" type="text/css" href="o3dv/website.css">
-	<script type="text/javascript" src="o3dv/featureset.js"></script>
-	<script type="text/javascript" src="o3dv/eventhandler.js"></script>
-	<script type="text/javascript" src="o3dv/utils.js"></script>
-	<script type="text/javascript" src="o3dv/cookies.js"></script>
-	<script type="text/javascript" src="o3dv/toolbar.js"></script>
-	<script type="text/javascript" src="o3dv/treeview.js"></script>
-	<script type="text/javascript" src="o3dv/modal.js"></script>
-	<script type="text/javascript" src="o3dv/dialogs.js"></script>
-	<script type="text/javascript" src="o3dv/openurldialog.js"></script>
-	<script type="text/javascript" src="o3dv/exportdialog.js"></script>
-	<script type="text/javascript" src="o3dv/sharingdialog.js"></script>
-	<script type="text/javascript" src="o3dv/cookiedialog.js"></script>
-	<script type="text/javascript" src="o3dv/modeldata.js"></script>
-	<script type="text/javascript" src="o3dv/navigator.js"></script>
-	<script type="text/javascript" src="o3dv/sidebarpanel.js"></script>
-	<script type="text/javascript" src="o3dv/detailssidebarpanel.js"></script>
-	<script type="text/javascript" src="o3dv/settingssidebarpanel.js"></script>
-	<script type="text/javascript" src="o3dv/sidebar.js"></script>
-	<script type="text/javascript" src="o3dv/hashhandler.js"></script>
-	<script type="text/javascript" src="o3dv/loader.js"></script>
-	<script type="text/javascript" src="o3dv/website.js"></script>
-	<script type="text/javascript" src="o3dv/embed.js"></script>
+	<link rel="stylesheet" type="text/css" href="o3dv/css/website.css">
+	<script type="text/javascript" src="o3dv/js/featureset.js"></script>
+	<script type="text/javascript" src="o3dv/js/eventhandler.js"></script>
+	<script type="text/javascript" src="o3dv/js/utils.js"></script>
+	<script type="text/javascript" src="o3dv/js/cookies.js"></script>
+	<script type="text/javascript" src="o3dv/js/toolbar.js"></script>
+	<script type="text/javascript" src="o3dv/js/treeview.js"></script>
+	<script type="text/javascript" src="o3dv/js/modal.js"></script>
+	<script type="text/javascript" src="o3dv/js/dialogs.js"></script>
+	<script type="text/javascript" src="o3dv/js/openurldialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/exportdialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/sharingdialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/cookiedialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/modeldata.js"></script>
+	<script type="text/javascript" src="o3dv/js/navigator.js"></script>
+	<script type="text/javascript" src="o3dv/js/sidebarpanel.js"></script>
+	<script type="text/javascript" src="o3dv/js/detailssidebarpanel.js"></script>
+	<script type="text/javascript" src="o3dv/js/settingssidebarpanel.js"></script>
+	<script type="text/javascript" src="o3dv/js/sidebar.js"></script>
+	<script type="text/javascript" src="o3dv/js/hashhandler.js"></script>
+	<script type="text/javascript" src="o3dv/js/loader.js"></script>
+	<script type="text/javascript" src="o3dv/js/website.js"></script>
+	<script type="text/javascript" src="o3dv/js/embed.js"></script>
 	<!-- website end -->
 
 	<!-- analytics start -->
diff --git a/website/index.html b/website/index.html
index 905e0bc..1f67004 100644
--- a/website/index.html
+++ b/website/index.html
@@ -77,29 +77,29 @@
 	<!-- engine end -->
 	
 	<!-- website start -->
-	<link rel="stylesheet" type="text/css" href="o3dv/website.css">
-	<script type="text/javascript" src="o3dv/featureset.js"></script>
-	<script type="text/javascript" src="o3dv/eventhandler.js"></script>
-	<script type="text/javascript" src="o3dv/utils.js"></script>
-	<script type="text/javascript" src="o3dv/cookies.js"></script>
-	<script type="text/javascript" src="o3dv/toolbar.js"></script>
-	<script type="text/javascript" src="o3dv/treeview.js"></script>
-	<script type="text/javascript" src="o3dv/modal.js"></script>
-	<script type="text/javascript" src="o3dv/dialogs.js"></script>
-	<script type="text/javascript" src="o3dv/openurldialog.js"></script>
-	<script type="text/javascript" src="o3dv/exportdialog.js"></script>
-	<script type="text/javascript" src="o3dv/sharingdialog.js"></script>
-	<script type="text/javascript" src="o3dv/cookiedialog.js"></script>
-	<script type="text/javascript" src="o3dv/modeldata.js"></script>
-	<script type="text/javascript" src="o3dv/navigator.js"></script>
-	<script type="text/javascript" src="o3dv/sidebarpanel.js"></script>
-	<script type="text/javascript" src="o3dv/detailssidebarpanel.js"></script>
-	<script type="text/javascript" src="o3dv/settingssidebarpanel.js"></script>
-	<script type="text/javascript" src="o3dv/sidebar.js"></script>
-	<script type="text/javascript" src="o3dv/hashhandler.js"></script>
-	<script type="text/javascript" src="o3dv/loader.js"></script>
-	<script type="text/javascript" src="o3dv/website.js"></script>
-	<script type="text/javascript" src="o3dv/embed.js"></script>
+	<link rel="stylesheet" type="text/css" href="o3dv/css/website.css">
+	<script type="text/javascript" src="o3dv/js/featureset.js"></script>
+	<script type="text/javascript" src="o3dv/js/eventhandler.js"></script>
+	<script type="text/javascript" src="o3dv/js/utils.js"></script>
+	<script type="text/javascript" src="o3dv/js/cookies.js"></script>
+	<script type="text/javascript" src="o3dv/js/toolbar.js"></script>
+	<script type="text/javascript" src="o3dv/js/treeview.js"></script>
+	<script type="text/javascript" src="o3dv/js/modal.js"></script>
+	<script type="text/javascript" src="o3dv/js/dialogs.js"></script>
+	<script type="text/javascript" src="o3dv/js/openurldialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/exportdialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/sharingdialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/cookiedialog.js"></script>
+	<script type="text/javascript" src="o3dv/js/modeldata.js"></script>
+	<script type="text/javascript" src="o3dv/js/navigator.js"></script>
+	<script type="text/javascript" src="o3dv/js/sidebarpanel.js"></script>
+	<script type="text/javascript" src="o3dv/js/detailssidebarpanel.js"></script>
+	<script type="text/javascript" src="o3dv/js/settingssidebarpanel.js"></script>
+	<script type="text/javascript" src="o3dv/js/sidebar.js"></script>
+	<script type="text/javascript" src="o3dv/js/hashhandler.js"></script>
+	<script type="text/javascript" src="o3dv/js/loader.js"></script>
+	<script type="text/javascript" src="o3dv/js/website.js"></script>
+	<script type="text/javascript" src="o3dv/js/embed.js"></script>
 	<!-- website end -->
 
 	<!-- externals start -->
diff --git a/website/o3dv/website.css b/website/o3dv/css/website.css
similarity index 100%
rename from website/o3dv/website.css
rename to website/o3dv/css/website.css
diff --git a/website/o3dv/cookiedialog.js b/website/o3dv/js/cookiedialog.js
similarity index 100%
rename from website/o3dv/cookiedialog.js
rename to website/o3dv/js/cookiedialog.js
diff --git a/website/o3dv/cookies.js b/website/o3dv/js/cookies.js
similarity index 100%
rename from website/o3dv/cookies.js
rename to website/o3dv/js/cookies.js
diff --git a/website/o3dv/detailssidebarpanel.js b/website/o3dv/js/detailssidebarpanel.js
similarity index 100%
rename from website/o3dv/detailssidebarpanel.js
rename to website/o3dv/js/detailssidebarpanel.js
diff --git a/website/o3dv/dialogs.js b/website/o3dv/js/dialogs.js
similarity index 100%
rename from website/o3dv/dialogs.js
rename to website/o3dv/js/dialogs.js
diff --git a/website/o3dv/embed.js b/website/o3dv/js/embed.js
similarity index 100%
rename from website/o3dv/embed.js
rename to website/o3dv/js/embed.js
diff --git a/website/o3dv/eventhandler.js b/website/o3dv/js/eventhandler.js
similarity index 100%
rename from website/o3dv/eventhandler.js
rename to website/o3dv/js/eventhandler.js
diff --git a/website/o3dv/exportdialog.js b/website/o3dv/js/exportdialog.js
similarity index 100%
rename from website/o3dv/exportdialog.js
rename to website/o3dv/js/exportdialog.js
diff --git a/website/o3dv/featureset.js b/website/o3dv/js/featureset.js
similarity index 100%
rename from website/o3dv/featureset.js
rename to website/o3dv/js/featureset.js
diff --git a/website/o3dv/hashhandler.js b/website/o3dv/js/hashhandler.js
similarity index 100%
rename from website/o3dv/hashhandler.js
rename to website/o3dv/js/hashhandler.js
diff --git a/website/o3dv/loader.js b/website/o3dv/js/loader.js
similarity index 100%
rename from website/o3dv/loader.js
rename to website/o3dv/js/loader.js
diff --git a/website/o3dv/modal.js b/website/o3dv/js/modal.js
similarity index 100%
rename from website/o3dv/modal.js
rename to website/o3dv/js/modal.js
diff --git a/website/o3dv/modeldata.js b/website/o3dv/js/modeldata.js
similarity index 100%
rename from website/o3dv/modeldata.js
rename to website/o3dv/js/modeldata.js
diff --git a/website/o3dv/navigator.js b/website/o3dv/js/navigator.js
similarity index 100%
rename from website/o3dv/navigator.js
rename to website/o3dv/js/navigator.js
diff --git a/website/o3dv/openurldialog.js b/website/o3dv/js/openurldialog.js
similarity index 100%
rename from website/o3dv/openurldialog.js
rename to website/o3dv/js/openurldialog.js
diff --git a/website/o3dv/settingssidebarpanel.js b/website/o3dv/js/settingssidebarpanel.js
similarity index 100%
rename from website/o3dv/settingssidebarpanel.js
rename to website/o3dv/js/settingssidebarpanel.js
diff --git a/website/o3dv/sharingdialog.js b/website/o3dv/js/sharingdialog.js
similarity index 100%
rename from website/o3dv/sharingdialog.js
rename to website/o3dv/js/sharingdialog.js
diff --git a/website/o3dv/sidebar.js b/website/o3dv/js/sidebar.js
similarity index 100%
rename from website/o3dv/sidebar.js
rename to website/o3dv/js/sidebar.js
diff --git a/website/o3dv/sidebarpanel.js b/website/o3dv/js/sidebarpanel.js
similarity index 100%
rename from website/o3dv/sidebarpanel.js
rename to website/o3dv/js/sidebarpanel.js
diff --git a/website/o3dv/toolbar.js b/website/o3dv/js/toolbar.js
similarity index 100%
rename from website/o3dv/toolbar.js
rename to website/o3dv/js/toolbar.js
diff --git a/website/o3dv/treeview.js b/website/o3dv/js/treeview.js
similarity index 100%
rename from website/o3dv/treeview.js
rename to website/o3dv/js/treeview.js
diff --git a/website/o3dv/utils.js b/website/o3dv/js/utils.js
similarity index 100%
rename from website/o3dv/utils.js
rename to website/o3dv/js/utils.js
diff --git a/website/o3dv/website.js b/website/o3dv/js/website.js
similarity index 100%
rename from website/o3dv/website.js
rename to website/o3dv/js/website.js