diff --git a/pandora/app/config.py b/pandora/app/config.py
index aabfdae37..2b69b8255 100644
--- a/pandora/app/config.py
+++ b/pandora/app/config.py
@@ -182,10 +182,15 @@ def update_static():
     js = []
     pandora_js = os.path.join(settings.STATIC_ROOT, 'js/pandora.min.js')
     pandora_json = os.path.join(settings.STATIC_ROOT, 'json/pandora.json')
-    for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js/pandora')):
+    for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js')):
         for f in files:
-            if f.endswith('.js') and len(f.split('.'))  == 2:
+            if not f in (
+                'pandora.js', 'pandora.min.js'
+            ) and f.endswith('.js') and len(f.split('.'))  == 2:
                 f = os.path.join(root, f)
+                #ignore old embed js file
+                if 'js/embed/' in f:
+                    continue
                 fsite = f.replace('.js', '.%s.js' % settings.CONFIG['site']['id'])
                 if os.path.exists(fsite):
                     f = fsite
diff --git a/static/js/pandora/UI.js b/static/js/UI.js
similarity index 100%
rename from static/js/pandora/UI.js
rename to static/js/UI.js
diff --git a/static/js/pandora/URL.js b/static/js/URL.js
similarity index 100%
rename from static/js/pandora/URL.js
rename to static/js/URL.js
diff --git a/static/js/pandora/account.js b/static/js/account.js
similarity index 100%
rename from static/js/pandora/account.js
rename to static/js/account.js
diff --git a/static/js/pandora/allItems.js b/static/js/allItems.js
similarity index 100%
rename from static/js/pandora/allItems.js
rename to static/js/allItems.js
diff --git a/static/js/pandora/annotationDialog.js b/static/js/annotationDialog.js
similarity index 100%
rename from static/js/pandora/annotationDialog.js
rename to static/js/annotationDialog.js
diff --git a/static/js/pandora/apiDialog.js b/static/js/apiDialog.js
similarity index 100%
rename from static/js/pandora/apiDialog.js
rename to static/js/apiDialog.js
diff --git a/static/js/pandora/appPanel.js b/static/js/appPanel.js
similarity index 100%
rename from static/js/pandora/appPanel.js
rename to static/js/appPanel.js
diff --git a/static/js/pandora/autovalidate.js b/static/js/autovalidate.js
similarity index 100%
rename from static/js/pandora/autovalidate.js
rename to static/js/autovalidate.js
diff --git a/static/js/pandora/backButton.js b/static/js/backButton.js
similarity index 100%
rename from static/js/pandora/backButton.js
rename to static/js/backButton.js
diff --git a/static/js/pandora/browser.js b/static/js/browser.js
similarity index 100%
rename from static/js/pandora/browser.js
rename to static/js/browser.js
diff --git a/static/js/pandora/chunkupload.js b/static/js/chunkupload.js
similarity index 100%
rename from static/js/pandora/chunkupload.js
rename to static/js/chunkupload.js
diff --git a/static/js/pandora/clipList.js b/static/js/clipList.js
similarity index 100%
rename from static/js/pandora/clipList.js
rename to static/js/clipList.js
diff --git a/static/js/pandora/clipsView.js b/static/js/clipsView.js
similarity index 100%
rename from static/js/pandora/clipsView.js
rename to static/js/clipsView.js
diff --git a/static/js/pandora/contactForm.js b/static/js/contactForm.js
similarity index 100%
rename from static/js/pandora/contactForm.js
rename to static/js/contactForm.js
diff --git a/static/js/pandora/contentPanel.js b/static/js/contentPanel.js
similarity index 100%
rename from static/js/pandora/contentPanel.js
rename to static/js/contentPanel.js
diff --git a/static/js/pandora/deleteDocumentDialog.js b/static/js/deleteDocumentDialog.js
similarity index 100%
rename from static/js/pandora/deleteDocumentDialog.js
rename to static/js/deleteDocumentDialog.js
diff --git a/static/js/pandora/deleteItemDialog.js b/static/js/deleteItemDialog.js
similarity index 100%
rename from static/js/pandora/deleteItemDialog.js
rename to static/js/deleteItemDialog.js
diff --git a/static/js/pandora/deleteListDialog.js b/static/js/deleteListDialog.js
similarity index 100%
rename from static/js/pandora/deleteListDialog.js
rename to static/js/deleteListDialog.js
diff --git a/static/js/pandora/documentsDialog.js b/static/js/documentsDialog.js
similarity index 100%
rename from static/js/pandora/documentsDialog.js
rename to static/js/documentsDialog.js
diff --git a/static/js/pandora/documentsView.js b/static/js/documentsView.js
similarity index 100%
rename from static/js/pandora/documentsView.js
rename to static/js/documentsView.js
diff --git a/static/js/pandora/editPanel.js b/static/js/editPanel.js
similarity index 100%
rename from static/js/pandora/editPanel.js
rename to static/js/editPanel.js
diff --git a/static/js/pandora/editor.js b/static/js/editor.js
similarity index 100%
rename from static/js/pandora/editor.js
rename to static/js/editor.js
diff --git a/static/js/pandora/embedDocumentDialog.js b/static/js/embedDocumentDialog.js
similarity index 100%
rename from static/js/pandora/embedDocumentDialog.js
rename to static/js/embedDocumentDialog.js
diff --git a/static/js/pandora/embedError.js b/static/js/embedError.js
similarity index 100%
rename from static/js/pandora/embedError.js
rename to static/js/embedError.js
diff --git a/static/js/pandora/embedList.js b/static/js/embedList.js
similarity index 100%
rename from static/js/pandora/embedList.js
rename to static/js/embedList.js
diff --git a/static/js/pandora/embedNavigation.js b/static/js/embedNavigation.js
similarity index 100%
rename from static/js/pandora/embedNavigation.js
rename to static/js/embedNavigation.js
diff --git a/static/js/pandora/embedPanel.js b/static/js/embedPanel.js
similarity index 100%
rename from static/js/pandora/embedPanel.js
rename to static/js/embedPanel.js
diff --git a/static/js/pandora/embedPlayer.js b/static/js/embedPlayer.js
similarity index 100%
rename from static/js/pandora/embedPlayer.js
rename to static/js/embedPlayer.js
diff --git a/static/js/pandora/embedTimeline.js b/static/js/embedTimeline.js
similarity index 100%
rename from static/js/pandora/embedTimeline.js
rename to static/js/embedTimeline.js
diff --git a/static/js/pandora/embedVideoDialog.js b/static/js/embedVideoDialog.js
similarity index 100%
rename from static/js/pandora/embedVideoDialog.js
rename to static/js/embedVideoDialog.js
diff --git a/static/js/pandora/errorDialog.js b/static/js/errorDialog.js
similarity index 100%
rename from static/js/pandora/errorDialog.js
rename to static/js/errorDialog.js
diff --git a/static/js/pandora/eventsDialog.js b/static/js/eventsDialog.js
similarity index 100%
rename from static/js/pandora/eventsDialog.js
rename to static/js/eventsDialog.js
diff --git a/static/js/pandora/filter.js b/static/js/filter.js
similarity index 100%
rename from static/js/pandora/filter.js
rename to static/js/filter.js
diff --git a/static/js/pandora/filterDialog.js b/static/js/filterDialog.js
similarity index 100%
rename from static/js/pandora/filterDialog.js
rename to static/js/filterDialog.js
diff --git a/static/js/pandora/filterForm.js b/static/js/filterForm.js
similarity index 100%
rename from static/js/pandora/filterForm.js
rename to static/js/filterForm.js
diff --git a/static/js/pandora/findElement.js b/static/js/findElement.js
similarity index 100%
rename from static/js/pandora/findElement.js
rename to static/js/findElement.js
diff --git a/static/js/pandora/folderBrowser.js b/static/js/folderBrowser.js
similarity index 100%
rename from static/js/pandora/folderBrowser.js
rename to static/js/folderBrowser.js
diff --git a/static/js/pandora/folderBrowserBar.js b/static/js/folderBrowserBar.js
similarity index 100%
rename from static/js/pandora/folderBrowserBar.js
rename to static/js/folderBrowserBar.js
diff --git a/static/js/pandora/folderBrowserList.js b/static/js/folderBrowserList.js
similarity index 100%
rename from static/js/pandora/folderBrowserList.js
rename to static/js/folderBrowserList.js
diff --git a/static/js/pandora/folderList.js b/static/js/folderList.js
similarity index 100%
rename from static/js/pandora/folderList.js
rename to static/js/folderList.js
diff --git a/static/js/pandora/folders.js b/static/js/folders.js
similarity index 100%
rename from static/js/pandora/folders.js
rename to static/js/folders.js
diff --git a/static/js/pandora/helpDialog.js b/static/js/helpDialog.js
similarity index 100%
rename from static/js/pandora/helpDialog.js
rename to static/js/helpDialog.js
diff --git a/static/js/pandora/home.0xdb.js b/static/js/home.0xdb.js
similarity index 100%
rename from static/js/pandora/home.0xdb.js
rename to static/js/home.0xdb.js
diff --git a/static/js/pandora/home.indiancinema.js b/static/js/home.indiancinema.js
similarity index 100%
rename from static/js/pandora/home.indiancinema.js
rename to static/js/home.indiancinema.js
diff --git a/static/js/pandora/home.js b/static/js/home.js
similarity index 100%
rename from static/js/pandora/home.js
rename to static/js/home.js
diff --git a/static/js/pandora/home.padma.js b/static/js/home.padma.js
similarity index 100%
rename from static/js/pandora/home.padma.js
rename to static/js/home.padma.js
diff --git a/static/js/pandora/homePage.js b/static/js/homePage.js
similarity index 100%
rename from static/js/pandora/homePage.js
rename to static/js/homePage.js
diff --git a/static/js/pandora/iconDialog.js b/static/js/iconDialog.js
similarity index 100%
rename from static/js/pandora/iconDialog.js
rename to static/js/iconDialog.js
diff --git a/static/js/pandora/idDialog.js b/static/js/idDialog.js
similarity index 100%
rename from static/js/pandora/idDialog.js
rename to static/js/idDialog.js
diff --git a/static/js/pandora/importAnnotations.js b/static/js/importAnnotations.js
similarity index 100%
rename from static/js/pandora/importAnnotations.js
rename to static/js/importAnnotations.js
diff --git a/static/js/pandora/info.js b/static/js/info.js
similarity index 100%
rename from static/js/pandora/info.js
rename to static/js/info.js
diff --git a/static/js/pandora/infoView.0xdb.js b/static/js/infoView.0xdb.js
similarity index 100%
rename from static/js/pandora/infoView.0xdb.js
rename to static/js/infoView.0xdb.js
diff --git a/static/js/pandora/infoView.indiancinema.js b/static/js/infoView.indiancinema.js
similarity index 100%
rename from static/js/pandora/infoView.indiancinema.js
rename to static/js/infoView.indiancinema.js
diff --git a/static/js/pandora/infoView.js b/static/js/infoView.js
similarity index 100%
rename from static/js/pandora/infoView.js
rename to static/js/infoView.js
diff --git a/static/js/pandora/infoView.padma.js b/static/js/infoView.padma.js
similarity index 100%
rename from static/js/pandora/infoView.padma.js
rename to static/js/infoView.padma.js
diff --git a/static/js/pandora/insertEmbedDialog.js b/static/js/insertEmbedDialog.js
similarity index 100%
rename from static/js/pandora/insertEmbedDialog.js
rename to static/js/insertEmbedDialog.js
diff --git a/static/js/pandora/item.js b/static/js/item.js
similarity index 100%
rename from static/js/pandora/item.js
rename to static/js/item.js
diff --git a/static/js/pandora/itemClips.js b/static/js/itemClips.js
similarity index 100%
rename from static/js/pandora/itemClips.js
rename to static/js/itemClips.js
diff --git a/static/js/pandora/leftPanel.js b/static/js/leftPanel.js
similarity index 100%
rename from static/js/pandora/leftPanel.js
rename to static/js/leftPanel.js
diff --git a/static/js/pandora/list.js b/static/js/list.js
similarity index 100%
rename from static/js/pandora/list.js
rename to static/js/list.js
diff --git a/static/js/pandora/listDialog.js b/static/js/listDialog.js
similarity index 100%
rename from static/js/pandora/listDialog.js
rename to static/js/listDialog.js
diff --git a/static/js/pandora/logsDialog.js b/static/js/logsDialog.js
similarity index 100%
rename from static/js/pandora/logsDialog.js
rename to static/js/logsDialog.js
diff --git a/static/js/pandora/mainMenu.js b/static/js/mainMenu.js
similarity index 100%
rename from static/js/pandora/mainMenu.js
rename to static/js/mainMenu.js
diff --git a/static/js/pandora/mainPanel.js b/static/js/mainPanel.js
similarity index 100%
rename from static/js/pandora/mainPanel.js
rename to static/js/mainPanel.js
diff --git a/static/js/pandora/makeListPrivateDialog.js b/static/js/makeListPrivateDialog.js
similarity index 100%
rename from static/js/pandora/makeListPrivateDialog.js
rename to static/js/makeListPrivateDialog.js
diff --git a/static/js/pandora/mediaView.js b/static/js/mediaView.js
similarity index 100%
rename from static/js/pandora/mediaView.js
rename to static/js/mediaView.js
diff --git a/static/js/pandora/metadataDialog.js b/static/js/metadataDialog.js
similarity index 100%
rename from static/js/pandora/metadataDialog.js
rename to static/js/metadataDialog.js
diff --git a/static/js/pandora/namesDialog.js b/static/js/namesDialog.js
similarity index 100%
rename from static/js/pandora/namesDialog.js
rename to static/js/namesDialog.js
diff --git a/static/js/pandora/navigationView.js b/static/js/navigationView.js
similarity index 100%
rename from static/js/pandora/navigationView.js
rename to static/js/navigationView.js
diff --git a/static/js/pandora/news.js b/static/js/news.js
similarity index 100%
rename from static/js/pandora/news.js
rename to static/js/news.js
diff --git a/static/js/pandora/onloadDialog.js b/static/js/onloadDialog.js
similarity index 100%
rename from static/js/pandora/onloadDialog.js
rename to static/js/onloadDialog.js
diff --git a/static/js/pandora/placesDialog.js b/static/js/placesDialog.js
similarity index 100%
rename from static/js/pandora/placesDialog.js
rename to static/js/placesDialog.js
diff --git a/static/js/pandora/player.js b/static/js/player.js
similarity index 100%
rename from static/js/pandora/player.js
rename to static/js/player.js
diff --git a/static/js/pandora/postersView.js b/static/js/postersView.js
similarity index 100%
rename from static/js/pandora/postersView.js
rename to static/js/postersView.js
diff --git a/static/js/pandora/preferencesDialog.js b/static/js/preferencesDialog.js
similarity index 100%
rename from static/js/pandora/preferencesDialog.js
rename to static/js/preferencesDialog.js
diff --git a/static/js/pandora/printView.js b/static/js/printView.js
similarity index 100%
rename from static/js/pandora/printView.js
rename to static/js/printView.js
diff --git a/static/js/pandora/publicLists.js b/static/js/publicLists.js
similarity index 100%
rename from static/js/pandora/publicLists.js
rename to static/js/publicLists.js
diff --git a/static/js/pandora/resetUIDialog.js b/static/js/resetUIDialog.js
similarity index 100%
rename from static/js/pandora/resetUIDialog.js
rename to static/js/resetUIDialog.js
diff --git a/static/js/pandora/rightPanel.js b/static/js/rightPanel.js
similarity index 100%
rename from static/js/pandora/rightPanel.js
rename to static/js/rightPanel.js
diff --git a/static/js/pandora/sectionButtons.js b/static/js/sectionButtons.js
similarity index 100%
rename from static/js/pandora/sectionButtons.js
rename to static/js/sectionButtons.js
diff --git a/static/js/pandora/sectionSelect.js b/static/js/sectionSelect.js
similarity index 100%
rename from static/js/pandora/sectionSelect.js
rename to static/js/sectionSelect.js
diff --git a/static/js/pandora/sectionbar.js b/static/js/sectionbar.js
similarity index 100%
rename from static/js/pandora/sectionbar.js
rename to static/js/sectionbar.js
diff --git a/static/js/pandora/sequencesDialog.js b/static/js/sequencesDialog.js
similarity index 100%
rename from static/js/pandora/sequencesDialog.js
rename to static/js/sequencesDialog.js
diff --git a/static/js/pandora/siteDialog.0xdb.js b/static/js/siteDialog.0xdb.js
similarity index 100%
rename from static/js/pandora/siteDialog.0xdb.js
rename to static/js/siteDialog.0xdb.js
diff --git a/static/js/pandora/siteDialog.js b/static/js/siteDialog.js
similarity index 100%
rename from static/js/pandora/siteDialog.js
rename to static/js/siteDialog.js
diff --git a/static/js/pandora/sortElement.js b/static/js/sortElement.js
similarity index 100%
rename from static/js/pandora/sortElement.js
rename to static/js/sortElement.js
diff --git a/static/js/pandora/sortMenu.js b/static/js/sortMenu.js
similarity index 100%
rename from static/js/pandora/sortMenu.js
rename to static/js/sortMenu.js
diff --git a/static/js/pandora/statisticsDialog.js b/static/js/statisticsDialog.js
similarity index 100%
rename from static/js/pandora/statisticsDialog.js
rename to static/js/statisticsDialog.js
diff --git a/static/js/pandora/statusbar.js b/static/js/statusbar.js
similarity index 100%
rename from static/js/pandora/statusbar.js
rename to static/js/statusbar.js
diff --git a/static/js/pandora/tests.js b/static/js/tests.js
similarity index 100%
rename from static/js/pandora/tests.js
rename to static/js/tests.js
diff --git a/static/js/pandora/textPanel.js b/static/js/textPanel.js
similarity index 100%
rename from static/js/pandora/textPanel.js
rename to static/js/textPanel.js
diff --git a/static/js/pandora/timeline.js b/static/js/timeline.js
similarity index 100%
rename from static/js/pandora/timeline.js
rename to static/js/timeline.js
diff --git a/static/js/pandora/titlesDialog.js b/static/js/titlesDialog.js
similarity index 100%
rename from static/js/pandora/titlesDialog.js
rename to static/js/titlesDialog.js
diff --git a/static/js/pandora/toolbar.js b/static/js/toolbar.js
similarity index 100%
rename from static/js/pandora/toolbar.js
rename to static/js/toolbar.js
diff --git a/static/js/pandora/tv.js b/static/js/tv.js
similarity index 100%
rename from static/js/pandora/tv.js
rename to static/js/tv.js
diff --git a/static/js/pandora/uploadDialog.js b/static/js/uploadDialog.js
similarity index 100%
rename from static/js/pandora/uploadDialog.js
rename to static/js/uploadDialog.js
diff --git a/static/js/pandora/uploadDocumentDialog.js b/static/js/uploadDocumentDialog.js
similarity index 100%
rename from static/js/pandora/uploadDocumentDialog.js
rename to static/js/uploadDocumentDialog.js
diff --git a/static/js/pandora/uploadPDFDialog.js b/static/js/uploadPDFDialog.js
similarity index 100%
rename from static/js/pandora/uploadPDFDialog.js
rename to static/js/uploadPDFDialog.js
diff --git a/static/js/pandora/usersDialog.js b/static/js/usersDialog.js
similarity index 100%
rename from static/js/pandora/usersDialog.js
rename to static/js/usersDialog.js
diff --git a/static/js/pandora/utils.js b/static/js/utils.js
similarity index 100%
rename from static/js/pandora/utils.js
rename to static/js/utils.js
diff --git a/static/js/pandora/videoPreview.js b/static/js/videoPreview.js
similarity index 100%
rename from static/js/pandora/videoPreview.js
rename to static/js/videoPreview.js
diff --git a/static/js/pandora/videoView.js b/static/js/videoView.js
similarity index 100%
rename from static/js/pandora/videoView.js
rename to static/js/videoView.js
diff --git a/static/js/pandora/viewSelect.js b/static/js/viewSelect.js
similarity index 100%
rename from static/js/pandora/viewSelect.js
rename to static/js/viewSelect.js