diff --git a/dashboard-ui1/about.html b/dashboard-ui/about.html
similarity index 100%
rename from dashboard-ui1/about.html
rename to dashboard-ui/about.html
diff --git a/dashboard-ui1/addplugin.html b/dashboard-ui/addplugin.html
similarity index 100%
rename from dashboard-ui1/addplugin.html
rename to dashboard-ui/addplugin.html
diff --git a/dashboard-ui1/advanced.html b/dashboard-ui/advanced.html
similarity index 100%
rename from dashboard-ui1/advanced.html
rename to dashboard-ui/advanced.html
diff --git a/dashboard-ui1/advancedmetadata.html b/dashboard-ui/advancedmetadata.html
similarity index 100%
rename from dashboard-ui1/advancedmetadata.html
rename to dashboard-ui/advancedmetadata.html
diff --git a/dashboard-ui1/css/images/bg.png b/dashboard-ui/css/images/bg.png
similarity index 100%
rename from dashboard-ui1/css/images/bg.png
rename to dashboard-ui/css/images/bg.png
diff --git a/dashboard-ui1/css/images/checkmarkblack.png b/dashboard-ui/css/images/checkmarkblack.png
similarity index 100%
rename from dashboard-ui1/css/images/checkmarkblack.png
rename to dashboard-ui/css/images/checkmarkblack.png
diff --git a/dashboard-ui1/css/images/checkmarkgreen.png b/dashboard-ui/css/images/checkmarkgreen.png
similarity index 100%
rename from dashboard-ui1/css/images/checkmarkgreen.png
rename to dashboard-ui/css/images/checkmarkgreen.png
diff --git a/dashboard-ui1/css/images/clients/android.png b/dashboard-ui/css/images/clients/android.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/android.png
rename to dashboard-ui/css/images/clients/android.png
diff --git a/dashboard-ui1/css/images/clients/dlna.png b/dashboard-ui/css/images/clients/dlna.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/dlna.png
rename to dashboard-ui/css/images/clients/dlna.png
diff --git a/dashboard-ui1/css/images/clients/html5.png b/dashboard-ui/css/images/clients/html5.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/html5.png
rename to dashboard-ui/css/images/clients/html5.png
diff --git a/dashboard-ui1/css/images/clients/ios.png b/dashboard-ui/css/images/clients/ios.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/ios.png
rename to dashboard-ui/css/images/clients/ios.png
diff --git a/dashboard-ui1/css/images/clients/mb.png b/dashboard-ui/css/images/clients/mb.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/mb.png
rename to dashboard-ui/css/images/clients/mb.png
diff --git a/dashboard-ui1/css/images/clients/win8.png b/dashboard-ui/css/images/clients/win8.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/win8.png
rename to dashboard-ui/css/images/clients/win8.png
diff --git a/dashboard-ui1/css/images/clients/windowsphone.png b/dashboard-ui/css/images/clients/windowsphone.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/windowsphone.png
rename to dashboard-ui/css/images/clients/windowsphone.png
diff --git a/dashboard-ui1/css/images/clients/windowsrt.png b/dashboard-ui/css/images/clients/windowsrt.png
similarity index 100%
rename from dashboard-ui1/css/images/clients/windowsrt.png
rename to dashboard-ui/css/images/clients/windowsrt.png
diff --git a/dashboard-ui1/css/images/home.png b/dashboard-ui/css/images/home.png
similarity index 100%
rename from dashboard-ui1/css/images/home.png
rename to dashboard-ui/css/images/home.png
diff --git a/dashboard-ui1/css/images/iossplash.png b/dashboard-ui/css/images/iossplash.png
similarity index 100%
rename from dashboard-ui1/css/images/iossplash.png
rename to dashboard-ui/css/images/iossplash.png
diff --git a/dashboard-ui1/css/images/items/detail/audio.png b/dashboard-ui/css/images/items/detail/audio.png
similarity index 100%
rename from dashboard-ui1/css/images/items/detail/audio.png
rename to dashboard-ui/css/images/items/detail/audio.png
diff --git a/dashboard-ui1/css/images/items/detail/game.png b/dashboard-ui/css/images/items/detail/game.png
similarity index 100%
rename from dashboard-ui1/css/images/items/detail/game.png
rename to dashboard-ui/css/images/items/detail/game.png
diff --git a/dashboard-ui1/css/images/items/detail/video.png b/dashboard-ui/css/images/items/detail/video.png
similarity index 100%
rename from dashboard-ui1/css/images/items/detail/video.png
rename to dashboard-ui/css/images/items/detail/video.png
diff --git a/dashboard-ui1/css/images/items/list/chapter.png b/dashboard-ui/css/images/items/list/chapter.png
similarity index 100%
rename from dashboard-ui1/css/images/items/list/chapter.png
rename to dashboard-ui/css/images/items/list/chapter.png
diff --git a/dashboard-ui1/css/images/items/list/collection.png b/dashboard-ui/css/images/items/list/collection.png
similarity index 100%
rename from dashboard-ui1/css/images/items/list/collection.png
rename to dashboard-ui/css/images/items/list/collection.png
diff --git a/dashboard-ui1/css/images/leftarrowblack.png b/dashboard-ui/css/images/leftarrowblack.png
similarity index 100%
rename from dashboard-ui1/css/images/leftarrowblack.png
rename to dashboard-ui/css/images/leftarrowblack.png
diff --git a/dashboard-ui1/css/images/leftarrowwhite.png b/dashboard-ui/css/images/leftarrowwhite.png
similarity index 100%
rename from dashboard-ui1/css/images/leftarrowwhite.png
rename to dashboard-ui/css/images/leftarrowwhite.png
diff --git a/dashboard-ui1/css/images/logindefault.png b/dashboard-ui/css/images/logindefault.png
similarity index 100%
rename from dashboard-ui1/css/images/logindefault.png
rename to dashboard-ui/css/images/logindefault.png
diff --git a/dashboard-ui1/css/images/mblogoicon.png b/dashboard-ui/css/images/mblogoicon.png
similarity index 100%
rename from dashboard-ui1/css/images/mblogoicon.png
rename to dashboard-ui/css/images/mblogoicon.png
diff --git a/dashboard-ui1/css/images/mblogotextblack.png b/dashboard-ui/css/images/mblogotextblack.png
similarity index 100%
rename from dashboard-ui1/css/images/mblogotextblack.png
rename to dashboard-ui/css/images/mblogotextblack.png
diff --git a/dashboard-ui1/css/images/mblogotextwhite.png b/dashboard-ui/css/images/mblogotextwhite.png
similarity index 100%
rename from dashboard-ui1/css/images/mblogotextwhite.png
rename to dashboard-ui/css/images/mblogotextwhite.png
diff --git a/dashboard-ui1/css/images/media/nexttrack.png b/dashboard-ui/css/images/media/nexttrack.png
similarity index 100%
rename from dashboard-ui1/css/images/media/nexttrack.png
rename to dashboard-ui/css/images/media/nexttrack.png
diff --git a/dashboard-ui1/css/images/media/pause.png b/dashboard-ui/css/images/media/pause.png
similarity index 100%
rename from dashboard-ui1/css/images/media/pause.png
rename to dashboard-ui/css/images/media/pause.png
diff --git a/dashboard-ui1/css/images/media/play.png b/dashboard-ui/css/images/media/play.png
similarity index 100%
rename from dashboard-ui1/css/images/media/play.png
rename to dashboard-ui/css/images/media/play.png
diff --git a/dashboard-ui1/css/images/media/playcircle.png b/dashboard-ui/css/images/media/playcircle.png
similarity index 100%
rename from dashboard-ui1/css/images/media/playcircle.png
rename to dashboard-ui/css/images/media/playcircle.png
diff --git a/dashboard-ui1/css/images/media/previoustrack.png b/dashboard-ui/css/images/media/previoustrack.png
similarity index 100%
rename from dashboard-ui1/css/images/media/previoustrack.png
rename to dashboard-ui/css/images/media/previoustrack.png
diff --git a/dashboard-ui1/css/images/media/stop.png b/dashboard-ui/css/images/media/stop.png
similarity index 100%
rename from dashboard-ui1/css/images/media/stop.png
rename to dashboard-ui/css/images/media/stop.png
diff --git a/dashboard-ui1/css/images/notifications/cancelled.png b/dashboard-ui/css/images/notifications/cancelled.png
similarity index 100%
rename from dashboard-ui1/css/images/notifications/cancelled.png
rename to dashboard-ui/css/images/notifications/cancelled.png
diff --git a/dashboard-ui1/css/images/notifications/done.png b/dashboard-ui/css/images/notifications/done.png
similarity index 100%
rename from dashboard-ui1/css/images/notifications/done.png
rename to dashboard-ui/css/images/notifications/done.png
diff --git a/dashboard-ui1/css/images/notifications/download.png b/dashboard-ui/css/images/notifications/download.png
similarity index 100%
rename from dashboard-ui1/css/images/notifications/download.png
rename to dashboard-ui/css/images/notifications/download.png
diff --git a/dashboard-ui1/css/images/notifications/error.png b/dashboard-ui/css/images/notifications/error.png
similarity index 100%
rename from dashboard-ui1/css/images/notifications/error.png
rename to dashboard-ui/css/images/notifications/error.png
diff --git a/dashboard-ui1/css/images/notifications/info.png b/dashboard-ui/css/images/notifications/info.png
similarity index 100%
rename from dashboard-ui1/css/images/notifications/info.png
rename to dashboard-ui/css/images/notifications/info.png
diff --git a/dashboard-ui1/css/images/rightarrow.png b/dashboard-ui/css/images/rightarrow.png
similarity index 100%
rename from dashboard-ui1/css/images/rightarrow.png
rename to dashboard-ui/css/images/rightarrow.png
diff --git a/dashboard-ui1/css/images/stars.png b/dashboard-ui/css/images/stars.png
similarity index 100%
rename from dashboard-ui1/css/images/stars.png
rename to dashboard-ui/css/images/stars.png
diff --git a/dashboard-ui1/css/images/supporter/donatepaypal.png b/dashboard-ui/css/images/supporter/donatepaypal.png
similarity index 100%
rename from dashboard-ui1/css/images/supporter/donatepaypal.png
rename to dashboard-ui/css/images/supporter/donatepaypal.png
diff --git a/dashboard-ui1/css/images/supporter/premiumflag.png b/dashboard-ui/css/images/supporter/premiumflag.png
similarity index 100%
rename from dashboard-ui1/css/images/supporter/premiumflag.png
rename to dashboard-ui/css/images/supporter/premiumflag.png
diff --git a/dashboard-ui1/css/images/supporter/registerpaypal.png b/dashboard-ui/css/images/supporter/registerpaypal.png
similarity index 100%
rename from dashboard-ui1/css/images/supporter/registerpaypal.png
rename to dashboard-ui/css/images/supporter/registerpaypal.png
diff --git a/dashboard-ui1/css/images/supporter/supporterbadge.png b/dashboard-ui/css/images/supporter/supporterbadge.png
similarity index 100%
rename from dashboard-ui1/css/images/supporter/supporterbadge.png
rename to dashboard-ui/css/images/supporter/supporterbadge.png
diff --git a/dashboard-ui1/css/images/supporter/supporterflag.png b/dashboard-ui/css/images/supporter/supporterflag.png
similarity index 100%
rename from dashboard-ui1/css/images/supporter/supporterflag.png
rename to dashboard-ui/css/images/supporter/supporterflag.png
diff --git a/dashboard-ui1/css/images/toolsblack.png b/dashboard-ui/css/images/toolsblack.png
similarity index 100%
rename from dashboard-ui1/css/images/toolsblack.png
rename to dashboard-ui/css/images/toolsblack.png
diff --git a/dashboard-ui1/css/images/toolswhite.png b/dashboard-ui/css/images/toolswhite.png
similarity index 100%
rename from dashboard-ui1/css/images/toolswhite.png
rename to dashboard-ui/css/images/toolswhite.png
diff --git a/dashboard-ui1/css/images/touchicon.png b/dashboard-ui/css/images/touchicon.png
similarity index 100%
rename from dashboard-ui1/css/images/touchicon.png
rename to dashboard-ui/css/images/touchicon.png
diff --git a/dashboard-ui1/css/images/touchicon114.png b/dashboard-ui/css/images/touchicon114.png
similarity index 100%
rename from dashboard-ui1/css/images/touchicon114.png
rename to dashboard-ui/css/images/touchicon114.png
diff --git a/dashboard-ui1/css/images/touchicon72.png b/dashboard-ui/css/images/touchicon72.png
similarity index 100%
rename from dashboard-ui1/css/images/touchicon72.png
rename to dashboard-ui/css/images/touchicon72.png
diff --git a/dashboard-ui1/css/images/userflyoutdefault.png b/dashboard-ui/css/images/userflyoutdefault.png
similarity index 100%
rename from dashboard-ui1/css/images/userflyoutdefault.png
rename to dashboard-ui/css/images/userflyoutdefault.png
diff --git a/dashboard-ui1/css/site.css b/dashboard-ui/css/site.css
similarity index 100%
rename from dashboard-ui1/css/site.css
rename to dashboard-ui/css/site.css
diff --git a/dashboard-ui1/dashboard.html b/dashboard-ui/dashboard.html
similarity index 100%
rename from dashboard-ui1/dashboard.html
rename to dashboard-ui/dashboard.html
diff --git a/dashboard-ui1/edituser.html b/dashboard-ui/edituser.html
similarity index 100%
rename from dashboard-ui1/edituser.html
rename to dashboard-ui/edituser.html
diff --git a/dashboard-ui1/favicon.ico b/dashboard-ui/favicon.ico
similarity index 100%
rename from dashboard-ui1/favicon.ico
rename to dashboard-ui/favicon.ico
diff --git a/dashboard-ui1/index.html b/dashboard-ui/index.html
similarity index 100%
rename from dashboard-ui1/index.html
rename to dashboard-ui/index.html
diff --git a/dashboard-ui1/itemDetails.html b/dashboard-ui/itemdetails.html
similarity index 100%
rename from dashboard-ui1/itemDetails.html
rename to dashboard-ui/itemdetails.html
diff --git a/dashboard-ui1/itemlist.html b/dashboard-ui/itemlist.html
similarity index 100%
rename from dashboard-ui1/itemlist.html
rename to dashboard-ui/itemlist.html
diff --git a/dashboard-ui1/library.html b/dashboard-ui/library.html
similarity index 100%
rename from dashboard-ui1/library.html
rename to dashboard-ui/library.html
diff --git a/dashboard-ui1/log.html b/dashboard-ui/log.html
similarity index 100%
rename from dashboard-ui1/log.html
rename to dashboard-ui/log.html
diff --git a/dashboard-ui1/login.html b/dashboard-ui/login.html
similarity index 100%
rename from dashboard-ui1/login.html
rename to dashboard-ui/login.html
diff --git a/dashboard-ui1/metadata.html b/dashboard-ui/metadata.html
similarity index 100%
rename from dashboard-ui1/metadata.html
rename to dashboard-ui/metadata.html
diff --git a/dashboard-ui1/metadataimages.html b/dashboard-ui/metadataimages.html
similarity index 100%
rename from dashboard-ui1/metadataimages.html
rename to dashboard-ui/metadataimages.html
diff --git a/dashboard-ui1/plugincatalog.html b/dashboard-ui/plugincatalog.html
similarity index 100%
rename from dashboard-ui1/plugincatalog.html
rename to dashboard-ui/plugincatalog.html
diff --git a/dashboard-ui1/plugins.html b/dashboard-ui/plugins.html
similarity index 100%
rename from dashboard-ui1/plugins.html
rename to dashboard-ui/plugins.html
diff --git a/dashboard-ui1/pluginupdates.html b/dashboard-ui/pluginupdates.html
similarity index 100%
rename from dashboard-ui1/pluginupdates.html
rename to dashboard-ui/pluginupdates.html
diff --git a/dashboard-ui1/scheduledtask.html b/dashboard-ui/scheduledtask.html
similarity index 100%
rename from dashboard-ui1/scheduledtask.html
rename to dashboard-ui/scheduledtask.html
diff --git a/dashboard-ui1/scheduledtasks.html b/dashboard-ui/scheduledtasks.html
similarity index 100%
rename from dashboard-ui1/scheduledtasks.html
rename to dashboard-ui/scheduledtasks.html
diff --git a/dashboard-ui1/scripts/ItemDetailPage.js b/dashboard-ui/scripts/Itemdetailpage.js
similarity index 100%
rename from dashboard-ui1/scripts/ItemDetailPage.js
rename to dashboard-ui/scripts/Itemdetailpage.js
diff --git a/dashboard-ui1/scripts/aboutpage.js b/dashboard-ui/scripts/aboutpage.js
similarity index 100%
rename from dashboard-ui1/scripts/aboutpage.js
rename to dashboard-ui/scripts/aboutpage.js
diff --git a/dashboard-ui1/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
similarity index 100%
rename from dashboard-ui1/scripts/addpluginpage.js
rename to dashboard-ui/scripts/addpluginpage.js
diff --git a/dashboard-ui1/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js
similarity index 100%
rename from dashboard-ui1/scripts/advancedconfigurationpage.js
rename to dashboard-ui/scripts/advancedconfigurationpage.js
diff --git a/dashboard-ui1/scripts/advancedmetadataconfigurationpage.js b/dashboard-ui/scripts/advancedmetadataconfigurationpage.js
similarity index 100%
rename from dashboard-ui1/scripts/advancedmetadataconfigurationpage.js
rename to dashboard-ui/scripts/advancedmetadataconfigurationpage.js
diff --git a/dashboard-ui1/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
similarity index 100%
rename from dashboard-ui1/scripts/dashboardpage.js
rename to dashboard-ui/scripts/dashboardpage.js
diff --git a/dashboard-ui1/scripts/displaysettingspage.js b/dashboard-ui/scripts/displaysettingspage.js
similarity index 100%
rename from dashboard-ui1/scripts/displaysettingspage.js
rename to dashboard-ui/scripts/displaysettingspage.js
diff --git a/dashboard-ui1/scripts/edituserpage.js b/dashboard-ui/scripts/edituserpage.js
similarity index 100%
rename from dashboard-ui1/scripts/edituserpage.js
rename to dashboard-ui/scripts/edituserpage.js
diff --git a/dashboard-ui1/scripts/extensions.js b/dashboard-ui/scripts/extensions.js
similarity index 100%
rename from dashboard-ui1/scripts/extensions.js
rename to dashboard-ui/scripts/extensions.js
diff --git a/dashboard-ui1/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
similarity index 100%
rename from dashboard-ui1/scripts/indexpage.js
rename to dashboard-ui/scripts/indexpage.js
diff --git a/dashboard-ui1/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
similarity index 100%
rename from dashboard-ui1/scripts/itemlistpage.js
rename to dashboard-ui/scripts/itemlistpage.js
diff --git a/dashboard-ui1/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
similarity index 100%
rename from dashboard-ui1/scripts/loginpage.js
rename to dashboard-ui/scripts/loginpage.js
diff --git a/dashboard-ui1/scripts/logpage.js b/dashboard-ui/scripts/logpage.js
similarity index 100%
rename from dashboard-ui1/scripts/logpage.js
rename to dashboard-ui/scripts/logpage.js
diff --git a/dashboard-ui1/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
similarity index 100%
rename from dashboard-ui1/scripts/medialibrarypage.js
rename to dashboard-ui/scripts/medialibrarypage.js
diff --git a/dashboard-ui1/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
similarity index 100%
rename from dashboard-ui1/scripts/mediaplayer.js
rename to dashboard-ui/scripts/mediaplayer.js
diff --git a/dashboard-ui1/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js
similarity index 100%
rename from dashboard-ui1/scripts/metadataconfigurationpage.js
rename to dashboard-ui/scripts/metadataconfigurationpage.js
diff --git a/dashboard-ui1/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
similarity index 100%
rename from dashboard-ui1/scripts/metadataimagespage.js
rename to dashboard-ui/scripts/metadataimagespage.js
diff --git a/dashboard-ui1/scripts/plugincatalogpage.js b/dashboard-ui/scripts/plugincatalogpage.js
similarity index 100%
rename from dashboard-ui1/scripts/plugincatalogpage.js
rename to dashboard-ui/scripts/plugincatalogpage.js
diff --git a/dashboard-ui1/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js
similarity index 100%
rename from dashboard-ui1/scripts/pluginspage.js
rename to dashboard-ui/scripts/pluginspage.js
diff --git a/dashboard-ui1/scripts/pluginupdatespage.js b/dashboard-ui/scripts/pluginupdatespage.js
similarity index 100%
rename from dashboard-ui1/scripts/pluginupdatespage.js
rename to dashboard-ui/scripts/pluginupdatespage.js
diff --git a/dashboard-ui1/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js
similarity index 100%
rename from dashboard-ui1/scripts/scheduledtaskpage.js
rename to dashboard-ui/scripts/scheduledtaskpage.js
diff --git a/dashboard-ui1/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js
similarity index 100%
rename from dashboard-ui1/scripts/scheduledtaskspage.js
rename to dashboard-ui/scripts/scheduledtaskspage.js
diff --git a/dashboard-ui1/scripts/site.js b/dashboard-ui/scripts/site.js
similarity index 100%
rename from dashboard-ui1/scripts/site.js
rename to dashboard-ui/scripts/site.js
diff --git a/dashboard-ui1/scripts/supporterkeypage.js b/dashboard-ui/scripts/supporterkeypage.js
similarity index 100%
rename from dashboard-ui1/scripts/supporterkeypage.js
rename to dashboard-ui/scripts/supporterkeypage.js
diff --git a/dashboard-ui1/scripts/supporterpage.js b/dashboard-ui/scripts/supporterpage.js
similarity index 100%
rename from dashboard-ui1/scripts/supporterpage.js
rename to dashboard-ui/scripts/supporterpage.js
diff --git a/dashboard-ui1/scripts/updatepasswordpage.js b/dashboard-ui/scripts/updatepasswordpage.js
similarity index 100%
rename from dashboard-ui1/scripts/updatepasswordpage.js
rename to dashboard-ui/scripts/updatepasswordpage.js
diff --git a/dashboard-ui1/scripts/userimagepage.js b/dashboard-ui/scripts/userimagepage.js
similarity index 100%
rename from dashboard-ui1/scripts/userimagepage.js
rename to dashboard-ui/scripts/userimagepage.js
diff --git a/dashboard-ui1/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
similarity index 100%
rename from dashboard-ui1/scripts/userprofilespage.js
rename to dashboard-ui/scripts/userprofilespage.js
diff --git a/dashboard-ui1/scripts/wizardfinishpage.js b/dashboard-ui/scripts/wizardfinishpage.js
similarity index 100%
rename from dashboard-ui1/scripts/wizardfinishpage.js
rename to dashboard-ui/scripts/wizardfinishpage.js
diff --git a/dashboard-ui1/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js
similarity index 100%
rename from dashboard-ui1/scripts/wizardstartpage.js
rename to dashboard-ui/scripts/wizardstartpage.js
diff --git a/dashboard-ui1/scripts/wizarduserpage.js b/dashboard-ui/scripts/wizarduserpage.js
similarity index 100%
rename from dashboard-ui1/scripts/wizarduserpage.js
rename to dashboard-ui/scripts/wizarduserpage.js
diff --git a/dashboard-ui1/support.html b/dashboard-ui/support.html
similarity index 100%
rename from dashboard-ui1/support.html
rename to dashboard-ui/support.html
diff --git a/dashboard-ui1/supporter.html b/dashboard-ui/supporter.html
similarity index 100%
rename from dashboard-ui1/supporter.html
rename to dashboard-ui/supporter.html
diff --git a/dashboard-ui1/supporterkey.html b/dashboard-ui/supporterkey.html
similarity index 100%
rename from dashboard-ui1/supporterkey.html
rename to dashboard-ui/supporterkey.html
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons-v2.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons-v2.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons-v2.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons-v2.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/faicons.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.eot b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.eot
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.eot
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.eot
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.ttf b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.ttf
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.ttf
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.ttf
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.woff b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.woff
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.woff
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/font/fontawesome-webfont.woff
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/ajax-loader.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/ajax-loader.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/ajax-loader.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/ajax-loader.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-black-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-black-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-black-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-black-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-white-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-white-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-white-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-18-white-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-black-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-black-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-black-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-black-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-white-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-white-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-white-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/images/icons-36-white-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/index.html b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/index.html
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/index.html
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/index.html
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.scss b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.scss
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.scss
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.scss
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.gif b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.gif
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.gif
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.gif
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/ajax-loader.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-black-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-black-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-black-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-black-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-white-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-white-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-white-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-18-white-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-black-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-black-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-black-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-black-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-white-pack.png b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-white-pack.png
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-white-pack.png
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/images/icons-36-white-pack.png
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/index.html b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/index.html
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/index.html
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/index.html
diff --git a/dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/jqm-icon-pack-2.0-original.css b/dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/jqm-icon-pack-2.0-original.css
similarity index 100%
rename from dashboard-ui1/thirdparty/jqm-icon-pack-3.0/original/jqm-icon-pack-2.0-original.css
rename to dashboard-ui/thirdparty/jqm-icon-pack-3.0/original/jqm-icon-pack-2.0-original.css
diff --git a/dashboard-ui1/uisettings.html b/dashboard-ui/uisettings.html
similarity index 100%
rename from dashboard-ui1/uisettings.html
rename to dashboard-ui/uisettings.html
diff --git a/dashboard-ui1/updatepassword.html b/dashboard-ui/updatepassword.html
similarity index 100%
rename from dashboard-ui1/updatepassword.html
rename to dashboard-ui/updatepassword.html
diff --git a/dashboard-ui1/userimage.html b/dashboard-ui/userimage.html
similarity index 100%
rename from dashboard-ui1/userimage.html
rename to dashboard-ui/userimage.html
diff --git a/dashboard-ui1/userprofiles.html b/dashboard-ui/userprofiles.html
similarity index 100%
rename from dashboard-ui1/userprofiles.html
rename to dashboard-ui/userprofiles.html
diff --git a/dashboard-ui1/wizardfinish.html b/dashboard-ui/wizardfinish.html
similarity index 100%
rename from dashboard-ui1/wizardfinish.html
rename to dashboard-ui/wizardfinish.html
diff --git a/dashboard-ui1/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
similarity index 100%
rename from dashboard-ui1/wizardlibrary.html
rename to dashboard-ui/wizardlibrary.html
diff --git a/dashboard-ui1/wizardstart.html b/dashboard-ui/wizardstart.html
similarity index 100%
rename from dashboard-ui1/wizardstart.html
rename to dashboard-ui/wizardstart.html
diff --git a/dashboard-ui1/wizarduser.html b/dashboard-ui/wizarduser.html
similarity index 100%
rename from dashboard-ui1/wizarduser.html
rename to dashboard-ui/wizarduser.html