Reorganizing the stylesheets & javascripts folders for every plugins

133 files changed, 212 insertions, 213 deletions

diff --git a/core/AssetManager.php b/core/AssetManager.php
index 11405b0c66..a1a1f9b14c 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -189,8 +189,8 @@ class Piwik_AssetManager
     {
         $priorityCssOrdered = array(
             'libs/',
-            'plugins/Zeitgeist/theme/common.css',
-            'plugins/Zeitgeist/theme/',
+            'plugins/Zeitgeist/stylesheets/common.css',
+            'plugins/Zeitgeist/stylesheets/',
             'plugins/',
         );
 
@@ -284,9 +284,9 @@ class Piwik_AssetManager
             'libs/jquery/jquery-ui.js',
             'libs/jquery/jquery.browser.js',
             'libs/',
-            'plugins/Zeitgeist/theme/common.js',
-            'plugins/Zeitgeist/theme/',
-            'plugins/CoreHome/templates/broadcast.js',
+            'plugins/Zeitgeist/javascripts/piwikHelper.js',
+            'plugins/Zeitgeist/javascripts/',
+            'plugins/CoreHome/javascripts/broadcast.js',
             'plugins/',
         );
 
diff --git a/core/Controller.php b/core/Controller.php
index 7619e2822e..0ae3c33320 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -718,7 +718,7 @@ abstract class Piwik_Controller
      */
     protected function getDefaultDate()
     {
-        // NOTE: a change in this function might mean a change in plugins/UsersManager/templates/userSettings.js as well
+        // NOTE: a change in this function might mean a change in plugins/UsersManager/javascripts/usersSettings.js as well
         $userSettingsDate = Piwik_UsersManager_API::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT_DATE);
         if ($userSettingsDate == 'yesterday') {
             return $userSettingsDate;
diff --git a/core/Piwik.php b/core/Piwik.php
index d63af0572c..93e4ad0afb 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -1483,7 +1483,7 @@ class Piwik
      */
     static public function getJavascriptCode($idSite, $piwikUrl)
     {
-        $jsCode = file_get_contents(PIWIK_INCLUDE_PATH . "/plugins/Zeitgeist/theme/javascriptCode.tpl");
+        $jsCode = file_get_contents(PIWIK_INCLUDE_PATH . "/plugins/Zeitgeist/templates/javascriptCode.tpl");
         $jsCode = htmlentities($jsCode);
         preg_match('~^(http|https)://(.*)$~D', $piwikUrl, $matches);
         $piwikUrl = @$matches[2];
diff --git a/core/Twig.php b/core/Twig.php
index 5cab5e82f4..a08a8a484a 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -114,7 +114,7 @@ class Piwik_Twig
     private function getDefaultThemeLoader()
     {
         $themeLoader = new Twig_Loader_Filesystem(array(
-            sprintf("%s/plugins/%s/theme/", PIWIK_INCLUDE_PATH, self::DEFAULT_THEME)
+            sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, self::DEFAULT_THEME)
         ));
 
         return $themeLoader;
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
index 0a63b9f505..99a3a40133 100644
--- a/core/ViewDataTable.php
+++ b/core/ViewDataTable.php
@@ -46,7 +46,7 @@ abstract class Piwik_ViewDataTable
      * Template file that will be loaded for this view.
      * Usually set in the Piwik_ViewDataTable_*
      *
-     * @var string eg. 'CoreHome/templates/cloud.tpl'
+     * @var string eg. 'CoreHome/templates/cloud.twig'
      */
     protected $dataTableTemplate = null;
 
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 48ed2d03a7..97cdeea7af 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -77,8 +77,8 @@ if (!function_exists('Piwik_ExitWithMessage')) {
                             <li><a target="_blank" href="http://demo.piwik.org">Piwik Online Demo</a></li>
                             </ul>';
         }
-        $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/theme/simple_structure_header.tpl');
-        $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/theme/simple_structure_footer.tpl');
+        $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_header.tpl');
+        $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_footer.tpl');
 
         $headerPage = str_replace('{$HTML_TITLE}', 'Piwik &rsaquo; Error', $headerPage);
         $content = '<p>' . $message . '</p>
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 0ea154fd6b..df4e74e831 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -63,7 +63,7 @@ class Piwik_API extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/API/css/styles.css";
+        $cssFiles[] = "plugins/API/stylesheets/listAllAPI.css";
     }
 }
 
diff --git a/plugins/API/css/styles.css b/plugins/API/stylesheets/listAllAPI.css
index 06a3c9f435..06a3c9f435 100644
--- a/plugins/API/css/styles.css
+++ b/plugins/API/stylesheets/listAllAPI.css
diff --git a/plugins/Annotations/Annotations.php b/plugins/Annotations/Annotations.php
index 937500053a..f8fcf71394 100755
--- a/plugins/Annotations/Annotations.php
+++ b/plugins/Annotations/Annotations.php
@@ -53,7 +53,7 @@ class Piwik_Annotations extends Piwik_Plugin
     function getCssFiles($notification)
     {
         $cssFiles = & $notification->getNotificationObject();
-        $cssFiles[] = "plugins/Annotations/templates/styles.css";
+        $cssFiles[] = "plugins/Annotations/stylesheets/annotations.css";
     }
 
     /**
@@ -64,6 +64,6 @@ class Piwik_Annotations extends Piwik_Plugin
     function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = "plugins/Annotations/templates/annotations.js";
+        $jsFiles[] = "plugins/Annotations/javascripts/annotations.js";
     }
 }
diff --git a/plugins/Annotations/templates/annotations.js b/plugins/Annotations/javascripts/annotations.js
index 9f1070b8a2..9f1070b8a2 100755
--- a/plugins/Annotations/templates/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
diff --git a/plugins/Annotations/templates/styles.css b/plugins/Annotations/stylesheets/annotations.css
index 089a8ef6c3..089a8ef6c3 100755
--- a/plugins/Annotations/templates/styles.css
+++ b/plugins/Annotations/stylesheets/annotations.css
diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index c77f509e9f..e6228d52fa 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -67,10 +67,10 @@ class Piwik_CoreAdminHome extends Piwik_Plugin
         $cssFiles = & $notification->getNotificationObject();
 
         $cssFiles[] = "libs/jquery/themes/base/jquery-ui.css";
-        $cssFiles[] = "plugins/CoreAdminHome/templates/menu.css";
-        $cssFiles[] = "themes/default/common.css";
-        $cssFiles[] = "plugins/CoreAdminHome/templates/styles.css";
-        $cssFiles[] = "plugins/CoreHome/templates/donate.css";
+        $cssFiles[] = "plugins/CoreAdminHome/stylesheets/menu.css";
+        $cssFiles[] = "plugins/Zeitgeist/stylesheets/common.css";
+        $cssFiles[] = "plugins/CoreAdminHome/stylesheets/generalSettings.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/donate.css";
     }
 
     /**
@@ -84,12 +84,12 @@ class Piwik_CoreAdminHome extends Piwik_Plugin
         $jsFiles[] = "libs/jquery/jquery-ui.js";
         $jsFiles[] = "libs/jquery/jquery.browser.js";
         $jsFiles[] = "libs/javascript/sprintf.js";
-        $jsFiles[] = "themes/default/common.js";
-        $jsFiles[] = "themes/default/ajaxHelper.js";
+        $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js";
+        $jsFiles[] = "plugins/Zeitgeist/javascripts/ajaxHelper.js";
         $jsFiles[] = "libs/jquery/jquery.history.js";
-        $jsFiles[] = "plugins/CoreHome/templates/broadcast.js";
-        $jsFiles[] = "plugins/CoreAdminHome/templates/generalSettings.js";
-        $jsFiles[] = "plugins/CoreHome/templates/donate.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/broadcast.js";
+        $jsFiles[] = "plugins/CoreAdminHome/javascripts/generalSettings.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/donate.js";
     }
 
     function addMenu()
diff --git a/plugins/CoreAdminHome/templates/generalSettings.js b/plugins/CoreAdminHome/javascripts/generalSettings.js
index 6a493626c7..6a493626c7 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.js
+++ b/plugins/CoreAdminHome/javascripts/generalSettings.js
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.js b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
index d1ecd3705f..d1ecd3705f 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.js
+++ b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
diff --git a/plugins/CoreAdminHome/templates/styles.css b/plugins/CoreAdminHome/stylesheets/generalSettings.css
index 71871038b0..71871038b0 100644
--- a/plugins/CoreAdminHome/templates/styles.css
+++ b/plugins/CoreAdminHome/stylesheets/generalSettings.css
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.css b/plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css
index 2aeafbbe6b..2aeafbbe6b 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.css
+++ b/plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css
diff --git a/plugins/CoreAdminHome/templates/menu.css b/plugins/CoreAdminHome/stylesheets/menu.css
index 207263f86a..207263f86a 100644
--- a/plugins/CoreAdminHome/templates/menu.css
+++ b/plugins/CoreAdminHome/stylesheets/menu.css
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig b/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig
index e9c6b27948..e50bc5c30b 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig
+++ b/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig
@@ -2,8 +2,8 @@
 
 {% block head %}
     {{ parent() }}
-    <link rel="stylesheet" href="plugins/CoreAdminHome/templates/jsTrackingGenerator.css"></link>
-    <script type="text/javascript" src="plugins/CoreAdminHome/templates/jsTrackingGenerator.js"></script>
+    <link rel="stylesheet" href="plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css"></link>
+    <script type="text/javascript" src="plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 49fb713a96..e3a1291f07 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -52,14 +52,14 @@ class Piwik_CoreHome extends Piwik_Plugin
         $cssFiles = & $notification->getNotificationObject();
 
         $cssFiles[] = "libs/jquery/themes/base/jquery-ui.css";
-        $cssFiles[] = "plugins/Zeitgeist/theme/common.css";
-        $cssFiles[] = "plugins/CoreHome/templates/styles.css";
-        $cssFiles[] = "plugins/CoreHome/templates/menu.css";
-        $cssFiles[] = "plugins/CoreHome/templates/datatable.css";
-        $cssFiles[] = "plugins/CoreHome/templates/cloud.css";
-        $cssFiles[] = "plugins/CoreHome/templates/jquery.ui.autocomplete.css";
-        $cssFiles[] = "plugins/CoreHome/templates/jqplot.css";
-        $cssFiles[] = "plugins/CoreHome/templates/donate.css";
+        $cssFiles[] = "plugins/Zeitgeist/stylesheets/common.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/corehome.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/menu.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/datatable.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/cloud.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/jqplot.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/donate.css";
     }
 
     /**
@@ -76,23 +76,22 @@ class Piwik_CoreHome extends Piwik_Plugin
         $jsFiles[] = "libs/jquery/jquery.scrollTo.js";
         $jsFiles[] = "libs/jquery/jquery.history.js";
         $jsFiles[] = "libs/javascript/sprintf.js";
-        $jsFiles[] = "plugins/Zeitgeist/theme/common.js";
-        $jsFiles[] = "plugins/Zeitgeist/theme/ajaxHelper.js";
-        $jsFiles[] = "plugins/CoreHome/templates/datatable.js";
-        $jsFiles[] = "plugins/CoreHome/templates/datatable_rowactions.js";
-        $jsFiles[] = "plugins/CoreHome/templates/popover.js";
-        $jsFiles[] = "plugins/CoreHome/templates/broadcast.js";
-        $jsFiles[] = "plugins/CoreHome/templates/menu.js";
-        $jsFiles[] = "plugins/CoreHome/templates/menu_init.js";
-        $jsFiles[] = "plugins/CoreHome/templates/calendar.js";
-        $jsFiles[] = "plugins/CoreHome/templates/date.js";
-        $jsFiles[] = "plugins/CoreHome/templates/autocomplete.js";
-        $jsFiles[] = "plugins/CoreHome/templates/sparkline.js";
-        $jsFiles[] = "plugins/CoreHome/templates/misc.js";
-        $jsFiles[] = "plugins/CoreHome/templates/datatable_manager.js";
-        $jsFiles[] = "plugins/CoreHome/templates/donate.js";
-
-        $jsFiles[] = "plugins/CoreHome/templates/jqplot.js";
+        $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js";
+        $jsFiles[] = "plugins/Zeitgeist/javascripts/ajaxHelper.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/datatable.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/datatable_rowactions.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/popover.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/broadcast.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/menu.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/menu_init.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/calendar.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/date.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/autocomplete.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/sparkline.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/corehome.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/datatable_manager.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/donate.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/jqplot.js";
         $jsFiles[] = "libs/jqplot/jqplot-custom.min.js";
     }
 
diff --git a/plugins/CoreHome/templates/autocomplete.js b/plugins/CoreHome/javascripts/autocomplete.js
index 0e5fa3d1fa..0e5fa3d1fa 100644
--- a/plugins/CoreHome/templates/autocomplete.js
+++ b/plugins/CoreHome/javascripts/autocomplete.js
diff --git a/plugins/CoreHome/templates/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js
index 0301425875..ccfb145033 100644
--- a/plugins/CoreHome/templates/broadcast.js
+++ b/plugins/CoreHome/javascripts/broadcast.js
@@ -78,7 +78,7 @@ var broadcast = {
      * 2. after calling $.history.load();  //look at broadcast.changeParameter();
      * 3. after pushing "Go Back" button of a browser
      *
-     * * Note: the method is manipulated in Overlay/templates/index.js - keep this in mind when making changes.
+     * * Note: the method is manipulated in Overlay/javascripts/Piwik_Overlay.js - keep this in mind when making changes.
      *
      * @param {string}  hash to load page with
      * @return {void}
@@ -372,7 +372,7 @@ var broadcast = {
     /**
      * Loads the given url with ajax and replaces the content
      *
-     * Note: the method is replaced in Overlay/templates/index.js - keep this in mind when making changes.
+     * Note: the method is replaced in Overlay/javascripts/Piwik_Overlay.js - keep this in mind when making changes.
      *
      * @param {string} urlAjax  url to load
      * @return {Boolean}
diff --git a/plugins/CoreHome/templates/calendar.js b/plugins/CoreHome/javascripts/calendar.js
index e531e375a9..e531e375a9 100644
--- a/plugins/CoreHome/templates/calendar.js
+++ b/plugins/CoreHome/javascripts/calendar.js
diff --git a/plugins/CoreHome/templates/misc.js b/plugins/CoreHome/javascripts/corehome.js
index 7c2ede9c2f..7c2ede9c2f 100755
--- a/plugins/CoreHome/templates/misc.js
+++ b/plugins/CoreHome/javascripts/corehome.js
diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/javascripts/datatable.js
index 71c4da7cb8..71c4da7cb8 100644
--- a/plugins/CoreHome/templates/datatable.js
+++ b/plugins/CoreHome/javascripts/datatable.js
diff --git a/plugins/CoreHome/templates/datatable_manager.js b/plugins/CoreHome/javascripts/datatable_manager.js
index f8330ebbcf..f8330ebbcf 100644
--- a/plugins/CoreHome/templates/datatable_manager.js
+++ b/plugins/CoreHome/javascripts/datatable_manager.js
diff --git a/plugins/CoreHome/templates/datatable_rowactions.js b/plugins/CoreHome/javascripts/datatable_rowactions.js
index 62931dd61e..62931dd61e 100644
--- a/plugins/CoreHome/templates/datatable_rowactions.js
+++ b/plugins/CoreHome/javascripts/datatable_rowactions.js
diff --git a/plugins/CoreHome/templates/date.js b/plugins/CoreHome/javascripts/date.js
index 1c6c5971bd..1c6c5971bd 100644
--- a/plugins/CoreHome/templates/date.js
+++ b/plugins/CoreHome/javascripts/date.js
diff --git a/plugins/CoreHome/templates/donate.js b/plugins/CoreHome/javascripts/donate.js
index bd540109da..bd540109da 100755
--- a/plugins/CoreHome/templates/donate.js
+++ b/plugins/CoreHome/javascripts/donate.js
diff --git a/plugins/CoreHome/templates/jqplot.js b/plugins/CoreHome/javascripts/jqplot.js
index a63a0d33c0..a63a0d33c0 100644
--- a/plugins/CoreHome/templates/jqplot.js
+++ b/plugins/CoreHome/javascripts/jqplot.js
diff --git a/plugins/CoreHome/templates/menu.js b/plugins/CoreHome/javascripts/menu.js
index 3be160b1ca..3be160b1ca 100644
--- a/plugins/CoreHome/templates/menu.js
+++ b/plugins/CoreHome/javascripts/menu.js
diff --git a/plugins/CoreHome/templates/menu_init.js b/plugins/CoreHome/javascripts/menu_init.js
index 4e9c325301..4e9c325301 100644
--- a/plugins/CoreHome/templates/menu_init.js
+++ b/plugins/CoreHome/javascripts/menu_init.js
diff --git a/plugins/CoreHome/templates/popover.js b/plugins/CoreHome/javascripts/popover.js
index 91f9c09ec1..91f9c09ec1 100644
--- a/plugins/CoreHome/templates/popover.js
+++ b/plugins/CoreHome/javascripts/popover.js
diff --git a/plugins/CoreHome/templates/sparkline.js b/plugins/CoreHome/javascripts/sparkline.js
index 04f1e5d492..04f1e5d492 100644
--- a/plugins/CoreHome/templates/sparkline.js
+++ b/plugins/CoreHome/javascripts/sparkline.js
diff --git a/plugins/CoreHome/templates/cloud.css b/plugins/CoreHome/stylesheets/cloud.css
index b17741e1cf..b17741e1cf 100644
--- a/plugins/CoreHome/templates/cloud.css
+++ b/plugins/CoreHome/stylesheets/cloud.css
diff --git a/plugins/CoreHome/templates/styles.css b/plugins/CoreHome/stylesheets/corehome.css
index ead49ddb3c..732f1a9def 100644
--- a/plugins/CoreHome/templates/styles.css
+++ b/plugins/CoreHome/stylesheets/corehome.css
@@ -32,7 +32,7 @@ h3 {
 }
 
 .page {
-    background: url(../../../plugins/Zeitgeist/images/page_border_grad.png) no-repeat 0 20px;
+    background: url(../../Zeitgeist/images/page_border_grad.png) no-repeat 0 20px;
     min-height: 10px;
 
 }
@@ -41,7 +41,7 @@ h3 {
     padding: 15px 15px 0 15px;
     min-height: 10px;
     position: relative;
-    background: url(../../../plugins/Zeitgeist/images/page_border_grad.png) no-repeat right 20px;
+    background: url(../../Zeitgeist/images/page_border_grad.png) no-repeat right 20px;
 
 }
 
@@ -166,7 +166,7 @@ div.pk-emptyGraph {
     line-height: 20px;
     font-weight: normal;
     text-align: center;
-    background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center 20px;
+    background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center 20px;
 }
 
 .Piwik_Popover_Loading_NameWithSubject {
diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/stylesheets/datatable.css
index 5f62d42a40..11757a0ac0 100644
--- a/plugins/CoreHome/templates/datatable.css
+++ b/plugins/CoreHome/stylesheets/datatable.css
@@ -285,7 +285,7 @@ table thead div {
     height: 30px;
     display: block !important;
     white-space: nowrap;
-    background: url(../../../plugins/Zeitgeist/images/search_bg.png) no-repeat center 0;
+    background: url(../../Zeitgeist/images/search_bg.png) no-repeat center 0;
     text-align: center;
 }
 
@@ -547,7 +547,7 @@ table.dataTable th .columnDocumentation {
 }
 
 table.dataTable th .columnDocumentationTitle {
-    background: url(../../../plugins/Zeitgeist/images/help.png) no-repeat;
+    background: url(../../Zeitgeist/images/help.png) no-repeat;
     line-height: 14px;
     padding: 2px 0 3px 21px;
     font-weight: bold;
@@ -579,14 +579,14 @@ table.dataTable th .columnDocumentationTitle {
     width: 16px;
     height: 16px;
     margin: 10px 0;
-    background: url(../../../plugins/Zeitgeist/images/help.png) no-repeat;
+    background: url(../../Zeitgeist/images/help.png) no-repeat;
 }
 
 h2 .reportDocumentationIcon {
     position: absolute;
     margin: 4px 0 0 0;
     display: none;
-    background: url(../../../plugins/Zeitgeist/images/help_grey.png) no-repeat;
+    background: url(../../Zeitgeist/images/help_grey.png) no-repeat;
 }
 
 h2 .reportDocumentationIcon.hidden {
@@ -658,7 +658,7 @@ body .ui-tooltip.rowActionTooltip {
     border-radius: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
-    background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc_light.png) no-repeat right 2px;
+    background: url(../../Zeitgeist/images/sort_subtable_desc_light.png) no-repeat right 2px;
     padding: 0 14px 0 4px;
     display: block;
     width: 24px;
@@ -676,7 +676,7 @@ body .ui-tooltip.rowActionTooltip {
     border-radius: 0 0 4px 4px;
     -moz-border-radius: 0 0 4px 4px;
     -webkit-border-radius: 0 0 4px 4px;
-    background-image: url(../../../plugins/Zeitgeist/images/sort_subtable_asc_light.png)
+    background-image: url(../../Zeitgeist/images/sort_subtable_asc_light.png)
 }
 
 .limitSelection ul {
@@ -728,7 +728,7 @@ a.tableConfigurationIcon {
     display: block;
     width: 30px;
     height: 22px;
-    background: url(../../../plugins/Zeitgeist/images/configure.png) no-repeat center 2px;
+    background: url(../../Zeitgeist/images/configure.png) no-repeat center 2px;
     position: absolute;
     z-index: 9;
     right: 0;
@@ -738,7 +738,7 @@ a.tableConfigurationIcon.highlighted {
     display: block;
     width: 30px;
     height: 22px;
-    background-image: url(../../../plugins/Zeitgeist/images/configure-highlight.png);
+    background-image: url(../../Zeitgeist/images/configure-highlight.png);
     position: absolute;
     z-index: 9;
     right: 0;
diff --git a/plugins/CoreHome/templates/donate.css b/plugins/CoreHome/stylesheets/donate.css
index f3f7faa443..f3f7faa443 100755
--- a/plugins/CoreHome/templates/donate.css
+++ b/plugins/CoreHome/stylesheets/donate.css
diff --git a/plugins/CoreHome/templates/jqplot.css b/plugins/CoreHome/stylesheets/jqplot.css
index be97c50926..c832107c37 100644
--- a/plugins/CoreHome/templates/jqplot.css
+++ b/plugins/CoreHome/stylesheets/jqplot.css
@@ -1,5 +1,5 @@
 .jqplot-loading {
-    background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center center white;
+    background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center center white;
     position: absolute;
     z-index: 10;
 }
@@ -169,7 +169,7 @@
     margin: 2px 0 5px 0;
     padding: 5px 0 5px 23px;
     color: #888;
-    background: url(../../../plugins/Zeitgeist/images/help.png) no-repeat left center;
+    background: url(../../Zeitgeist/images/help.png) no-repeat left center;
 }
 
 .rowevolution .metric-selectbox,
@@ -206,7 +206,7 @@ a.rowevolution-startmulti:hover {
     width: 24px;
     height: 16px;
     margin-top: 3px;
-    background: url(../../../plugins/Zeitgeist/images/chart_line_edit.png) no-repeat center center;
+    background: url(../../Zeitgeist/images/chart_line_edit.png) no-repeat center center;
     overflow: hidden;
     text-indent: -999px;
 }
@@ -216,7 +216,7 @@ a.rowevolution-startmulti:hover {
     position: absolute;
     z-index: 1010; /* must be above ui dialog */
     margin-top: -2px;
-    background: url(../../../plugins/Zeitgeist/images/chart_line_edit.png) no-repeat 7px 4px #f7f7f7;
+    background: url(../../Zeitgeist/images/chart_line_edit.png) no-repeat 7px 4px #f7f7f7;
     font-size: 11px;
     font-weight: normal;
     border: 1px solid #e4e5e4;
diff --git a/plugins/CoreHome/templates/jquery.ui.autocomplete.css b/plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css
index 596337c242..596337c242 100644
--- a/plugins/CoreHome/templates/jquery.ui.autocomplete.css
+++ b/plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css
diff --git a/plugins/CoreHome/templates/menu.css b/plugins/CoreHome/stylesheets/menu.css
index f702b95409..f702b95409 100644
--- a/plugins/CoreHome/templates/menu.css
+++ b/plugins/CoreHome/stylesheets/menu.css
diff --git a/plugins/CoreHome/templates/js_css_includes.twig b/plugins/CoreHome/templates/js_css_includes.twig
index 6429704810..eb9a3cdbb1 100644
--- a/plugins/CoreHome/templates/js_css_includes.twig
+++ b/plugins/CoreHome/templates/js_css_includes.twig
@@ -3,5 +3,5 @@
     {{ includeAssets({"type":"js"}) }}
 {% endautoescape %}
 {% if 'General_LayoutDirection'|translate =='rtl' %}
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/rtl.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
 {% endif %}
diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig
index 500a813e8f..e20c4a027d 100644
--- a/plugins/CoreUpdater/templates/layout.twig
+++ b/plugins/CoreUpdater/templates/layout.twig
@@ -6,11 +6,11 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
 
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/simple_structure.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/simple_structure.css"/>
     <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/styles.css"/>
-    <link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/donate.css" />
-    <link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/jquery.ui.autocomplete.css" />
+    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/styles.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/CoreHome/stylesheets/donate.css" />
+    <link rel="stylesheet" type="text/css" href="plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css" />
     <style type="text/css">
         * {
             margin: 0;
@@ -30,9 +30,9 @@
 
     <script type="text/javascript" src="libs/jquery/jquery.js"></script>
     <script type="text/javascript" src="libs/jquery/jquery-ui.js"></script>
-    <script type="text/javascript" src="plugins/CoreHome/templates/donate.js"></script>
+    <script type="text/javascript" src="plugins/CoreHome/javascripts/donate.js"></script>
     {% if 'General_LayoutDirection'|translate =='rtl' %}
-    <link rel="stylesheet" type="text/css" href="themes/default/rtl.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
     {% endif %}
     {{ loadJavascriptTranslations(['CoreHome'])|raw }}
 </head>
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index 3bee79818d..47a8dfedea 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -248,7 +248,7 @@ class Piwik_Dashboard extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/CoreHome/templates/datatable.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/datatable.css";
         $cssFiles[] = "plugins/Dashboard/stylesheets/dashboard.css";
     }
 
diff --git a/plugins/ExampleRssWidget/ExampleRssWidget.php b/plugins/ExampleRssWidget/ExampleRssWidget.php
index 4fac8a6f73..fdf1bc78d7 100644
--- a/plugins/ExampleRssWidget/ExampleRssWidget.php
+++ b/plugins/ExampleRssWidget/ExampleRssWidget.php
@@ -52,7 +52,7 @@ class Piwik_ExampleRssWidget extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/ExampleRssWidget/templates/styles.css";
+        $cssFiles[] = "plugins/ExampleRssWidget/stylesheets/rss.css";
     }
 
     public function addWidgets()
diff --git a/plugins/ExampleRssWidget/templates/styles.css b/plugins/ExampleRssWidget/stylesheets/rss.css
index 5676571a7e..5676571a7e 100644
--- a/plugins/ExampleRssWidget/templates/styles.css
+++ b/plugins/ExampleRssWidget/stylesheets/rss.css
diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php
index d0094578ed..bb43437905 100644
--- a/plugins/Feedback/Feedback.php
+++ b/plugins/Feedback/Feedback.php
@@ -53,7 +53,7 @@ class Piwik_Feedback extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/Feedback/templates/styles.css";
+        $cssFiles[] = "plugins/Feedback/stylesheets/feedback.css";
     }
 
     /**
@@ -63,7 +63,7 @@ class Piwik_Feedback extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/Feedback/templates/feedback.js";
+        $jsFiles[] = "plugins/Feedback/javascripts/feedback.js";
     }
 
 }
diff --git a/plugins/Feedback/templates/feedback.js b/plugins/Feedback/javascripts/feedback.js
index 5f7112cf8f..5f7112cf8f 100644
--- a/plugins/Feedback/templates/feedback.js
+++ b/plugins/Feedback/javascripts/feedback.js
diff --git a/plugins/Feedback/templates/styles.css b/plugins/Feedback/stylesheets/feedback.css
index 258f078ca1..258f078ca1 100644
--- a/plugins/Feedback/templates/styles.css
+++ b/plugins/Feedback/stylesheets/feedback.css
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 5e0fe62728..dd8a138bc4 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -402,7 +402,7 @@ class Piwik_Goals extends Piwik_Plugin
     function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = "plugins/Goals/templates/GoalForm.js";
+        $jsFiles[] = "plugins/Goals/javascripts/goalsForm.js";
     }
 
     /**
@@ -411,7 +411,7 @@ class Piwik_Goals extends Piwik_Plugin
     function getCssFiles($notification)
     {
         $cssFiles = & $notification->getNotificationObject();
-        $cssFiles[] = "plugins/Goals/templates/goals.css";
+        $cssFiles[] = "plugins/Goals/stylesheets/goals.css";
     }
 
     /**
diff --git a/plugins/Goals/templates/GoalForm.js b/plugins/Goals/javascripts/goalsForm.js
index fa1d0beceb..fa1d0beceb 100644
--- a/plugins/Goals/templates/GoalForm.js
+++ b/plugins/Goals/javascripts/goalsForm.js
diff --git a/plugins/Goals/templates/goals.css b/plugins/Goals/stylesheets/goals.css
index 52602215bb..52602215bb 100644
--- a/plugins/Goals/templates/goals.css
+++ b/plugins/Goals/stylesheets/goals.css
diff --git a/plugins/Goals/templates/overview.twig b/plugins/Goals/templates/overview.twig
index 30926819ea..54f3219721 100644
--- a/plugins/Goals/templates/overview.twig
+++ b/plugins/Goals/templates/overview.twig
@@ -1,4 +1,4 @@
-<link rel="stylesheet" type="text/css" href="plugins/Goals/templates/goals.css"/>
+<link rel="stylesheet" type="text/css" href="plugins/Goals/stylesheets/goals.css"/>
 
 {% include "@Goals/title_and_evolution_graph.twig" %}
 {% set sum_nb_conversions=nb_conversions %}
diff --git a/plugins/Goals/templates/single_goal.twig b/plugins/Goals/templates/single_goal.twig
index a6a87ba55f..5b241fcbe0 100644
--- a/plugins/Goals/templates/single_goal.twig
+++ b/plugins/Goals/templates/single_goal.twig
@@ -1,4 +1,4 @@
-<link rel="stylesheet" type="text/css" href="plugins/Goals/templates/goals.css"/>
+<link rel="stylesheet" type="text/css" href="plugins/Goals/stylesheets/goals.css"/>
 {% include "@Goals/title_and_evolution_graph.twig" %}
 
 <div class="clear"></div>
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index ede139e2aa..b6301f5926 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -95,6 +95,6 @@ class Piwik_Installation extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/Installation/templates/systemCheckPage.css";
+        $cssFiles[] = "plugins/Installation/stylesheets/systemCheckPage.css";
     }
 }
diff --git a/plugins/Installation/templates/install.css b/plugins/Installation/stylesheets/installation.css
index 3d75fb66fd..3d75fb66fd 100644
--- a/plugins/Installation/templates/install.css
+++ b/plugins/Installation/stylesheets/installation.css
diff --git a/plugins/Installation/templates/systemCheckPage.css b/plugins/Installation/stylesheets/systemCheckPage.css
index 49444ce275..49444ce275 100755
--- a/plugins/Installation/templates/systemCheckPage.css
+++ b/plugins/Installation/stylesheets/systemCheckPage.css
diff --git a/plugins/Installation/templates/structure.twig b/plugins/Installation/templates/structure.twig
index b523ffd03d..897c5f2986 100644
--- a/plugins/Installation/templates/structure.twig
+++ b/plugins/Installation/templates/structure.twig
@@ -5,9 +5,9 @@
     <title>Piwik &rsaquo; {{ 'Installation_Installation'|translate }}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/common.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/common.css"/>
     <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/styles.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/styles.css"/>
     <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
     <script type="text/javascript" src="libs/jquery/jquery.js"></script>
     <script type="text/javascript" src="libs/jquery/jquery-ui.js"></script>
@@ -22,9 +22,9 @@
         });
     </script>
 
-    <link rel="stylesheet" type="text/css" href="plugins/Installation/templates/install.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Installation/stylesheets/installation.css"/>
     {% if 'General_LayoutDirection'|translate =='rtl' %}
-        <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/rtl.css"/>
+        <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
     {% endif %}
 </head>
 <body>
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 270b9071a2..8d54ccf1b4 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -45,7 +45,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "themes/default/styles.css";
+        $cssFiles[] = "plugins/Zeitgeist/stylesheets/styles.css";
     }
 
     /**
@@ -55,7 +55,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/LanguagesManager/templates/languageSelector.js";
+        $jsFiles[] = "plugins/LanguagesManager/javascripts/languageSelector.js";
     }
 
     /**
@@ -68,7 +68,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
 
     /**
      * Adds the languages drop-down list to topbars other than the main one rendered
-     * in CoreHome/templates/top_bar.tpl. The 'other' topbars are on the Installation
+     * in CoreHome/templates/top_bar.twig. The 'other' topbars are on the Installation
      * and CoreUpdater screens.
      *
      * @param Piwik_Event_Notification $notification notification object
@@ -78,7 +78,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
         $str =& $notification->getNotificationObject();
         // piwik object & scripts aren't loaded in 'other' topbars
         $str .= "<script type='text/javascript'>if (!window.piwik) window.piwik={};</script>";
-        $str .= "<script type='text/javascript' src='plugins/LanguagesManager/templates/languageSelector.js'></script>";
+        $str .= "<script type='text/javascript' src='plugins/LanguagesManager/javascripts/languageSelector.js'></script>";
         $str .= $this->getLanguagesSelector();
     }
 
diff --git a/plugins/LanguagesManager/templates/languageSelector.js b/plugins/LanguagesManager/javascripts/languageSelector.js
index 1240374d74..1240374d74 100644
--- a/plugins/LanguagesManager/templates/languageSelector.js
+++ b/plugins/LanguagesManager/javascripts/languageSelector.js
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index 4a505d0ad2..2b8ff54b42 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -42,7 +42,7 @@ class Piwik_Live extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/Live/templates/live.css";
+        $cssFiles[] = "plugins/Live/stylesheets/live.css";
     }
 
     /**
@@ -52,7 +52,7 @@ class Piwik_Live extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/Live/templates/scripts/live.js";
+        $jsFiles[] = "plugins/Live/javascripts/live.js";
     }
 
     function addMenu()
diff --git a/plugins/Live/templates/scripts/live.js b/plugins/Live/javascripts/live.js
index f726b10671..f726b10671 100644
--- a/plugins/Live/templates/scripts/live.js
+++ b/plugins/Live/javascripts/live.js
diff --git a/plugins/Live/templates/live.css b/plugins/Live/stylesheets/live.css
index ce03d2eade..ce03d2eade 100644
--- a/plugins/Live/templates/live.css
+++ b/plugins/Live/stylesheets/live.css
diff --git a/plugins/Login/templates/login.js b/plugins/Login/javascripts/login.js
index 5458942fef..5458942fef 100755
--- a/plugins/Login/templates/login.js
+++ b/plugins/Login/javascripts/login.js
diff --git a/plugins/Login/templates/login.css b/plugins/Login/stylesheets/login.css
index 8a66711eb2..14e0f8f25b 100644
--- a/plugins/Login/templates/login.css
+++ b/plugins/Login/stylesheets/login.css
@@ -111,7 +111,7 @@ form {
 
 #login_form_password, #reset_form_password,
 #reset_form_password_bis, #login_form_login, #reset_form_login {
-    background: #fff url(../../../plugins/Zeitgeist/images/login-sprite.png) no-repeat;
+    background: #fff url(../../Zeitgeist/images/login-sprite.png) no-repeat;
 }
 
 #login_form_password, #reset_form_password, #reset_form_password_bis {
@@ -192,7 +192,7 @@ a {
 }
 
 #logo .description .arrow {
-    background: url(../../../plugins/Zeitgeist/images/affix-arrow.png);
+    background: url(../../Zeitgeist/images/affix-arrow.png);
     width: 50px;
     height: 68px;
     position: absolute;
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index 79ce3f050c..a346ce4650 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -7,7 +7,7 @@
     <title>{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
-    <link rel="stylesheet" type="text/css" href="plugins/Login/templates/login.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Login/stylesheets/login.css"/>
     <meta name="description" content="{{ 'General_OpenSourceWebAnalytics'|translate }}" />
     <!--[if lt IE 9]>
     <script src="libs/html5shiv/html5shiv.js"></script>
@@ -29,9 +29,9 @@
             $('input').placeholder();
         });
     </script>
-    <script type="text/javascript" src="plugins/Login/templates/login.js"></script>
+    <script type="text/javascript" src="plugins/Login/javascripts/login.js"></script>
     {% if 'General_LayoutDirection'|translate =='rtl' %}
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/rtl.css"/>
+    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
     {% endif %}
     {% include "@CoreHome/iframe_buster_header.twig" %}
 </head>
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index 426798f183..7d56fe14f2 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -109,7 +109,7 @@ class Piwik_MobileMessaging extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/MobileMessaging/scripts/MobileMessagingSettings.js";
+        $jsFiles[] = "plugins/MobileMessaging/javascripts/MobileMessagingSettings.js";
     }
 
     /**
diff --git a/plugins/MobileMessaging/scripts/MobileMessagingSettings.js b/plugins/MobileMessaging/javascripts/MobileMessagingSettings.js
index 207d4c725d..207d4c725d 100644
--- a/plugins/MobileMessaging/scripts/MobileMessagingSettings.js
+++ b/plugins/MobileMessaging/javascripts/MobileMessagingSettings.js
diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php
index 43797132c7..763b8f4797 100644
--- a/plugins/MultiSites/MultiSites.php
+++ b/plugins/MultiSites/MultiSites.php
@@ -89,7 +89,7 @@ class Piwik_MultiSites extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/MultiSites/templates/common.js";
+        $jsFiles[] = "plugins/MultiSites/javascripts/multiSites.js";
     }
 
     /**
@@ -99,6 +99,6 @@ class Piwik_MultiSites extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/MultiSites/templates/styles.css";
+        $cssFiles[] = "plugins/MultiSites/stylesheets/multiSites.css";
     }
 }
diff --git a/plugins/MultiSites/templates/common.js b/plugins/MultiSites/javascripts/multiSites.js
index 15c8aade97..15c8aade97 100644
--- a/plugins/MultiSites/templates/common.js
+++ b/plugins/MultiSites/javascripts/multiSites.js
diff --git a/plugins/MultiSites/templates/styles.css b/plugins/MultiSites/stylesheets/multiSites.css
index 50e15c4720..958256c67a 100644
--- a/plugins/MultiSites/templates/styles.css
+++ b/plugins/MultiSites/stylesheets/multiSites.css
@@ -58,14 +58,14 @@
     width: 16px;
     height: 13px;
     display: inline-block;
-    background-image: url(../../../plugins/Zeitgeist/images/sortdesc.png);
+    background-image: url(../../Zeitgeist/images/sortdesc.png);
 }
 
 .multisites_asc {
     width: 16px;
     height: 13px;
     display: inline-block;
-    background-image: url(../../../plugins/Zeitgeist/images/sortasc.png);
+    background-image: url(../../Zeitgeist/images/sortasc.png);
 }
 
 #mt thead {
diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php
index b7bf6c3da4..abf8faaf96 100644
--- a/plugins/Overlay/Overlay.php
+++ b/plugins/Overlay/Overlay.php
@@ -31,8 +31,8 @@ class Piwik_Overlay extends Piwik_Plugin
     public function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = 'plugins/Overlay/templates/rowaction.js';
-        $jsFiles[] = 'plugins/Overlay/templates/helper.js';
+        $jsFiles[] = 'plugins/Overlay/javascripts/rowaction.js';
+        $jsFiles[] = 'plugins/Overlay/javascripts/Overlay_Helper.js';
     }
 
 }
diff --git a/plugins/Overlay/templates/helper.js b/plugins/Overlay/javascripts/Overlay_Helper.js
index 1342bf79f0..1342bf79f0 100644
--- a/plugins/Overlay/templates/helper.js
+++ b/plugins/Overlay/javascripts/Overlay_Helper.js
diff --git a/plugins/Overlay/templates/index.js b/plugins/Overlay/javascripts/Piwik_Overlay.js
index 0caaefe559..0caaefe559 100644
--- a/plugins/Overlay/templates/index.js
+++ b/plugins/Overlay/javascripts/Piwik_Overlay.js
diff --git a/plugins/Overlay/templates/rowaction.js b/plugins/Overlay/javascripts/rowaction.js
index caa1f10a8b..caa1f10a8b 100644
--- a/plugins/Overlay/templates/rowaction.js
+++ b/plugins/Overlay/javascripts/rowaction.js
diff --git a/plugins/Overlay/templates/index.css b/plugins/Overlay/stylesheets/overlay.css
index bf389d16f3..41f2a433e5 100644
--- a/plugins/Overlay/templates/index.css
+++ b/plugins/Overlay/stylesheets/overlay.css
@@ -37,7 +37,7 @@ a#Overlay_Title {
 
 #Overlay_DateRangeSelection {
     padding: 30px 0 20px 23px;
-    background: url(../../../plugins/Zeitgeist/images/icon-calendar.gif) 2px 33px no-repeat;
+    background: url(../../Zeitgeist/images/icon-calendar.gif) 2px 33px no-repeat;
     margin-left: 5px;
 }
 
@@ -49,7 +49,7 @@ a#Overlay_Title {
 }
 
 #Overlay_Loading {
-    background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center 10px;
+    background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center 10px;
     width: 190px;
     padding-top: 30px;
     margin-top: 30px;
@@ -83,7 +83,7 @@ a#Overlay_Transitions {
 
 a#Overlay_RowEvolution {
     margin-top: 20px;
-    background: url(../../../plugins/Zeitgeist/images/row_evolution_hover.png) no-repeat 0 7px;
+    background: url(../../Zeitgeist/images/row_evolution_hover.png) no-repeat 0 7px;
 }
 
 a#Overlay_Transitions {
@@ -92,7 +92,7 @@ a#Overlay_Transitions {
 
 a#Overlay_FullScreen {
     margin-top: 20px;
-    background: url(../../../plugins/Zeitgeist/images/fullscreen.png) no-repeat 3px 8px;
+    background: url(../../Zeitgeist/images/fullscreen.png) no-repeat 3px 8px;
 }
 
 a#Overlay_FullScreen:hover,
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index 4b806478cb..3fe9b66b61 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -2,8 +2,8 @@
 
 {% block head %}
     {{ parent() }}
-    <script type="text/javascript" src="plugins/Overlay/templates/index.js"></script>
-    <link rel="stylesheet" type="text/css" href="plugins/Overlay/templates/index.css" />
+    <script type="text/javascript" src="plugins/Overlay/javascripts/Piwik_Overlay.js"></script>
+    <link rel="stylesheet" type="text/css" href="plugins/Overlay/templates/overlay.css" />
 {% endblock %}
 
 {% block content %}
diff --git a/plugins/Overlay/templates/sidebar.twig b/plugins/Overlay/templates/sidebar.twig
index 3e23ca50a6..3ff6ee50a8 100644
--- a/plugins/Overlay/templates/sidebar.twig
+++ b/plugins/Overlay/templates/sidebar.twig
@@ -16,7 +16,7 @@
             </div>
         {% endfor %}
     {% else %}
-        <!-- note: the class Overlay_NoData is used in index.js -->
+        <!-- note: the class Overlay_NoData is used in Piwik_Overlay.js -->
         <div class="Overlay_NoData">{{ 'Overlay_NoData'|translate }}</div>
     {% endif %}
 </div>
\ No newline at end of file
diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php
index 99814647db..15d0f534a8 100644
--- a/plugins/PDFReports/PDFReports.php
+++ b/plugins/PDFReports/PDFReports.php
@@ -109,7 +109,7 @@ class Piwik_PDFReports extends Piwik_Plugin
     function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = "plugins/PDFReports/templates/pdf.js";
+        $jsFiles[] = "plugins/PDFReports/javascripts/pdf.js";
     }
 
     /**
diff --git a/plugins/PDFReports/templates/pdf.js b/plugins/PDFReports/javascripts/pdf.js
index 75e3ff831b..75e3ff831b 100644
--- a/plugins/PDFReports/templates/pdf.js
+++ b/plugins/PDFReports/javascripts/pdf.js
diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php
index 840fe5cfc2..a538a96e08 100644
--- a/plugins/PrivacyManager/PrivacyManager.php
+++ b/plugins/PrivacyManager/PrivacyManager.php
@@ -94,7 +94,7 @@ class Piwik_PrivacyManager extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/PrivacyManager/templates/privacySettings.js";
+        $jsFiles[] = "plugins/PrivacyManager/javascripts/privacySettings.js";
     }
 
     function addMenu()
diff --git a/plugins/PrivacyManager/templates/privacySettings.js b/plugins/PrivacyManager/javascripts/privacySettings.js
index 75de9b8caa..75de9b8caa 100644
--- a/plugins/PrivacyManager/templates/privacySettings.js
+++ b/plugins/PrivacyManager/javascripts/privacySettings.js
diff --git a/plugins/SEO/templates/rank.js b/plugins/SEO/javascripts/rank.js
index 1a9dc07d0c..1a9dc07d0c 100644
--- a/plugins/SEO/templates/rank.js
+++ b/plugins/SEO/javascripts/rank.js
diff --git a/plugins/SEO/templates/index.twig b/plugins/SEO/templates/index.twig
index 2bdcfda818..1d6e9deb22 100644
--- a/plugins/SEO/templates/index.twig
+++ b/plugins/SEO/templates/index.twig
@@ -1,5 +1,5 @@
 <div id='SeoRanks'>
-    <script type="text/javascript" src="plugins/SEO/templates/rank.js"></script>
+    <script type="text/javascript" src="plugins/SEO/javascripts/rank.js"></script>
 
     <form method="post" style="padding: 8px;">
         <div align="left" class="mediumtext">
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index 0087f2e614..7615873a95 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -92,18 +92,18 @@ class Piwik_SegmentEditor extends Piwik_Plugin
     public function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = "plugins/SegmentEditor/templates/jquery.jscrollpane.js";
-        $jsFiles[] = "plugins/SegmentEditor/templates/Segmentation.js";
-        $jsFiles[] = "plugins/SegmentEditor/templates/jquery.mousewheel.js";
-        $jsFiles[] = "plugins/SegmentEditor/templates/mwheelIntent.js";
+        $jsFiles[] = "plugins/SegmentEditor/javascripts/jquery.jscrollpane.js";
+        $jsFiles[] = "plugins/SegmentEditor/javascripts/Segmentation.js";
+        $jsFiles[] = "plugins/SegmentEditor/javascripts/jquery.mousewheel.js";
+        $jsFiles[] = "plugins/SegmentEditor/javascripts/mwheelIntent.js";
     }
 
     public function getCssFiles($notification)
     {
         $cssFiles = & $notification->getNotificationObject();
-        $cssFiles[] = "plugins/SegmentEditor/templates/Segmentation.css";
-        $cssFiles[] = "plugins/SegmentEditor/templates/jquery.jscrollpane.css";
-        $cssFiles[] = "plugins/SegmentEditor/templates/scroll.css";
+        $cssFiles[] = "plugins/SegmentEditor/stylesheets/segmentation.css";
+        $cssFiles[] = "plugins/SegmentEditor/stylesheets/jquery.jscrollpane.css";
+        $cssFiles[] = "plugins/SegmentEditor/stylesheets/scroll.css";
     }
 
 }
diff --git a/plugins/SegmentEditor/templates/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
index d18dc9ee47..d18dc9ee47 100644
--- a/plugins/SegmentEditor/templates/Segmentation.js
+++ b/plugins/SegmentEditor/javascripts/Segmentation.js
diff --git a/plugins/SegmentEditor/templates/jquery.jscrollpane.js b/plugins/SegmentEditor/javascripts/jquery.jscrollpane.js
index 88f190c692..88f190c692 100644
--- a/plugins/SegmentEditor/templates/jquery.jscrollpane.js
+++ b/plugins/SegmentEditor/javascripts/jquery.jscrollpane.js
diff --git a/plugins/SegmentEditor/templates/jquery.mousewheel.js b/plugins/SegmentEditor/javascripts/jquery.mousewheel.js
index 9d65c7162b..9d65c7162b 100644
--- a/plugins/SegmentEditor/templates/jquery.mousewheel.js
+++ b/plugins/SegmentEditor/javascripts/jquery.mousewheel.js
diff --git a/plugins/SegmentEditor/templates/mwheelIntent.js b/plugins/SegmentEditor/javascripts/mwheelIntent.js
index 72b7d135ca..72b7d135ca 100644
--- a/plugins/SegmentEditor/templates/mwheelIntent.js
+++ b/plugins/SegmentEditor/javascripts/mwheelIntent.js
diff --git a/plugins/SegmentEditor/templates/jquery.jscrollpane.css b/plugins/SegmentEditor/stylesheets/jquery.jscrollpane.css
index 0364216fe0..0364216fe0 100644
--- a/plugins/SegmentEditor/templates/jquery.jscrollpane.css
+++ b/plugins/SegmentEditor/stylesheets/jquery.jscrollpane.css
diff --git a/plugins/SegmentEditor/templates/scroll.css b/plugins/SegmentEditor/stylesheets/scroll.css
index 508adb4c7a..508adb4c7a 100644
--- a/plugins/SegmentEditor/templates/scroll.css
+++ b/plugins/SegmentEditor/stylesheets/scroll.css
diff --git a/plugins/SegmentEditor/templates/Segmentation.css b/plugins/SegmentEditor/stylesheets/segmentation.css
index f9d5d17c93..184592fb28 100644
--- a/plugins/SegmentEditor/templates/Segmentation.css
+++ b/plugins/SegmentEditor/stylesheets/segmentation.css
@@ -329,7 +329,7 @@ div.scrollable {
 }
 .segment-element .segment-top a.dropdown {
   padding: 0 17px 0 0;
-  background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc.png) 100% -2px no-repeat;
+  background: url(../../Zeitgeist/images/sort_subtable_desc.png) 100% -2px no-repeat;
 }
 .segment-element .segment-footer {
   background: #eae8e3;
@@ -453,7 +453,7 @@ div.scrollable {
   cursor: pointer;
 }
 span.segmentationTitle {
-  background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc.png) right center no-repeat !important;
+  background: url(../../Zeitgeist/images/sort_subtable_desc.png) right center no-repeat !important;
   padding-right: 20px !important;
   width: 160px !important;
   display: block !important;
@@ -490,7 +490,7 @@ body > a.ddmetric {
   padding-right: 18px;
 }
 .hovered {
-  border-color: #a0a0a0!Important;
+  border-color: #a0a0a0 !important;
 }
 a.metric_category {
   display: block;
@@ -504,7 +504,7 @@ a.metric_category {
   position: relative;
 }
 .no_results a {
-  cursor: normal;
+  cursor: default;
 }
 .ui-widget-segmentation {
   border: 1px solid #D4D4D4 !important;
@@ -521,7 +521,7 @@ a.metric_category {
 }
 
 #available_segments a.dropdown {
-    background: url("../../../plugins/Zeitgeist/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important;
+    background: url("../../Zeitgeist/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important;
     padding: 0 17px 0 0 !important;
 }
 .notification{
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index b258a29b8f..54b7f9330d 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -57,7 +57,7 @@ class Piwik_SitesManager extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "themes/default/styles.css";
+        $cssFiles[] = "plugins/Zeitgeist/stylesheets/styles.css";
     }
 
     /**
@@ -69,7 +69,7 @@ class Piwik_SitesManager extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/SitesManager/templates/SitesManager.js";
+        $jsFiles[] = "plugins/SitesManager/javascripts/SitesManager.js";
     }
 
     /**
diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js
index 4d32b283f3..4d32b283f3 100644
--- a/plugins/SitesManager/templates/SitesManager.js
+++ b/plugins/SitesManager/javascripts/SitesManager.js
diff --git a/plugins/Transitions/Transitions.php b/plugins/Transitions/Transitions.php
index 4adaf3f997..0e43c1cef9 100644
--- a/plugins/Transitions/Transitions.php
+++ b/plugins/Transitions/Transitions.php
@@ -41,13 +41,13 @@ class Piwik_Transitions extends Piwik_Plugin
     public function getCssFiles($notification)
     {
         $cssFiles = & $notification->getNotificationObject();
-        $cssFiles[] = 'plugins/Transitions/templates/transitions.css';
+        $cssFiles[] = 'plugins/Transitions/stylesheets/transitions.css';
     }
 
     public function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = 'plugins/Transitions/templates/transitions.js';
+        $jsFiles[] = 'plugins/Transitions/javascripts/transitions.js';
     }
 
     /**
diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/javascripts/transitions.js
index 14ccd28a19..14ccd28a19 100644
--- a/plugins/Transitions/templates/transitions.js
+++ b/plugins/Transitions/javascripts/transitions.js
diff --git a/plugins/Transitions/templates/transitions.css b/plugins/Transitions/stylesheets/transitions.css
index 6a02d1659f..6a02d1659f 100644
--- a/plugins/Transitions/templates/transitions.css
+++ b/plugins/Transitions/stylesheets/transitions.css
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 34003af178..a054dae31c 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -78,7 +78,7 @@ class Piwik_UserCountry extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/UserCountry/templates/styles.css";
+        $cssFiles[] = "plugins/UserCountry/stylesheets/userCountry.css";
     }
 
     /**
@@ -88,7 +88,7 @@ class Piwik_UserCountry extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/UserCountry/templates/admin.js";
+        $jsFiles[] = "plugins/UserCountry/javascripts/userCountry.js";
     }
 
     /**
diff --git a/plugins/UserCountry/templates/admin.js b/plugins/UserCountry/javascripts/userCountry.js
index 69857b7294..68e9165e1c 100755
--- a/plugins/UserCountry/templates/admin.js
+++ b/plugins/UserCountry/javascripts/userCountry.js
@@ -130,64 +130,64 @@ $(document).ready(function () {
         });
     });
 
-    $('body').on('click', '#start-automatic-update-geoip', function () {
-        $('#geoipdb-screen1').hide("slide", {direction: "left"}, 800, function () {
-            $('#geoip-db-mangement').text(_pk_translate('UserCountry_SetupAutomaticUpdatesOfGeoIP_js'));
-            $('#geoipdb-update-info').fadeIn(1000);
+    $('body')
+        .on('click', '#start-automatic-update-geoip', function () {
+            $('#geoipdb-screen1').hide("slide", {direction: "left"}, 800, function () {
+                $('#geoip-db-mangement').text(_pk_translate('UserCountry_SetupAutomaticUpdatesOfGeoIP_js'));
+                $('#geoipdb-update-info').fadeIn(1000);
+            });
+        })
+        .on('click', '#update-geoip-links', function () {
+            $('#geoipdb-update-info-error').hide();
+
+            var currentDownloading = null,
+                updateGeoIPSuccess = function (response) {
+                    if (response && response.error) {
+                        $('#geoip-progressbar-container').hide();
+                        $('#geoipdb-update-info-error').html(response.error).show();
+                    }
+                    else if (response && response.to_download) {
+                        var continuing = currentDownloading == response.to_download;
+                        currentDownloading = response.to_download;
+
+                        // show progress bar w/ message
+                        $('#geoip-updater-progressbar').progressbar('option', 'value', 1);
+                        $('#geoip-updater-progressbar-label').html(response.to_download_label);
+                        $('#geoip-progressbar-container').show();
+
+                        // start/continue download
+                        downloadNextChunk(
+                            'downloadMissingGeoIpDb', 'geoipdb-update-info', 'geoip-updater-progressbar',
+                            continuing, {key: response.to_download}, updateGeoIPSuccess);
+                    }
+                    else {
+                        $('#geoipdb-update-info-error').hide();
+                        $('#geoip-updater-progressbar-label').html('');
+                        $('#geoip-progressbar-container').hide();
+
+                        // fade in/out Done message
+                        $('#done-updating-updater').fadeIn(1000, function () {
+                            setTimeout(function () {
+                                $('#done-updating-updater').fadeOut(1000);
+                            }, 3000);
+                        });
+                    }
+                };
+
+            // setup the auto-updater
+            var ajaxRequest = new ajaxHelper();
+            ajaxRequest.addParams({
+                period: $('#geoip-update-period-cell>input:checked').val()
+            }, 'get');
+            ajaxRequest.addParams({
+                module: 'UserCountry',
+                action: 'updateGeoIPLinks',
+                token_auth: piwik.token_auth,
+                loc_db: $('#geoip-location-db').val(),
+                isp_db: $('#geoip-isp-db').val(),
+                org_db: $('#geoip-org-db').val()
+            }, 'post');
+            ajaxRequest.setCallback(updateGeoIPSuccess);
+            ajaxRequest.send(false);
         });
-    });
-
-    $('body').on('click', '#update-geoip-links', function () {
-        $('#geoipdb-update-info-error').hide();
-
-        var currentDownloading = null,
-            updateGeoIPSuccess = function (response) {
-                if (response && response.error) {
-                    $('#geoip-progressbar-container').hide();
-                    $('#geoipdb-update-info-error').html(response.error).show();
-                }
-                else if (response && response.to_download) {
-                    var continuing = currentDownloading == response.to_download;
-                    currentDownloading = response.to_download;
-
-                    // show progress bar w/ message
-                    $('#geoip-updater-progressbar').progressbar('option', 'value', 1);
-                    $('#geoip-updater-progressbar-label').html(response.to_download_label);
-                    $('#geoip-progressbar-container').show();
-
-                    // start/continue download
-                    downloadNextChunk(
-                        'downloadMissingGeoIpDb', 'geoipdb-update-info', 'geoip-updater-progressbar',
-                        continuing, {key: response.to_download}, updateGeoIPSuccess);
-                }
-                else {
-                    $('#geoipdb-update-info-error').hide();
-                    $('#geoip-updater-progressbar-label').html('');
-                    $('#geoip-progressbar-container').hide();
-
-                    // fade in/out Done message
-                    $('#done-updating-updater').fadeIn(1000, function () {
-                        setTimeout(function () {
-                            $('#done-updating-updater').fadeOut(1000);
-                        }, 3000);
-                    });
-                }
-            };
-
-        // setup the auto-updater
-        var ajaxRequest = new ajaxHelper();
-        ajaxRequest.addParams({
-            period: $('#geoip-update-period-cell>input:checked').val()
-        }, 'get');
-        ajaxRequest.addParams({
-            module: 'UserCountry',
-            action: 'updateGeoIPLinks',
-            token_auth: piwik.token_auth,
-            loc_db: $('#geoip-location-db').val(),
-            isp_db: $('#geoip-isp-db').val(),
-            org_db: $('#geoip-org-db').val()
-        }, 'post');
-        ajaxRequest.setCallback(updateGeoIPSuccess);
-        ajaxRequest.send(false);
-    });
 });
diff --git a/plugins/UserCountry/templates/styles.css b/plugins/UserCountry/stylesheets/userCountry.css
index 50c26af3a3..50c26af3a3 100755
--- a/plugins/UserCountry/templates/styles.css
+++ b/plugins/UserCountry/stylesheets/userCountry.css
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 39fa0ba457..d6ef194faa 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -80,7 +80,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
                                                          ));
         $view->metrics = $config['metrics'] = $this->getMetrics($idSite, $period, $date, $token_auth);
         $config['svgBasePath'] = 'plugins/UserCountryMap/svg/';
-        $config['mapCssPath'] = 'plugins/UserCountryMap/css/map.css';
+        $config['mapCssPath'] = 'plugins/UserCountryMap/stylesheets/map.css';
         $view->config = Piwik_Common::json_encode($config);
         $view->noData = empty($config['visitsSummary']['nb_visits']);
 
diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index eb091c1f8c..adbf9d5dba 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -62,19 +62,19 @@ class Piwik_UserCountryMap extends Piwik_Plugin
     public function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = "plugins/UserCountryMap/js/vendor/raphael.min.js";
-        $jsFiles[] = "plugins/UserCountryMap/js/vendor/jquery.qtip.min.js";
-        $jsFiles[] = "plugins/UserCountryMap/js/vendor/kartograph.min.js";
-        $jsFiles[] = "plugins/UserCountryMap/js/vendor/chroma.min.js";
-        $jsFiles[] = "plugins/UserCountryMap/js/visitor-map.js";
-        $jsFiles[] = "plugins/UserCountryMap/js/realtime-map.js";
+        $jsFiles[] = "plugins/UserCountryMap/javascripts/vendor/raphael.min.js";
+        $jsFiles[] = "plugins/UserCountryMap/javascripts/vendor/jquery.qtip.min.js";
+        $jsFiles[] = "plugins/UserCountryMap/javascripts/vendor/kartograph.min.js";
+        $jsFiles[] = "plugins/UserCountryMap/javascripts/vendor/chroma.min.js";
+        $jsFiles[] = "plugins/UserCountryMap/javascripts/visitor-map.js";
+        $jsFiles[] = "plugins/UserCountryMap/javascripts/realtime-map.js";
     }
 
     public function getCssFiles($notification)
     {
         $cssFiles = &$notification->getNotificationObject();
-        $cssFiles[] = "plugins/UserCountryMap/css/visitor-map.css";
-        $cssFiles[] = "plugins/UserCountryMap/css/realtime-map.css";
+        $cssFiles[] = "plugins/UserCountryMap/stylesheets/visitor-map.css";
+        $cssFiles[] = "plugins/UserCountryMap/stylesheets/realtime-map.css";
     }
 
 }
diff --git a/plugins/UserCountryMap/js/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js
index 431b749089..431b749089 100644
--- a/plugins/UserCountryMap/js/realtime-map.js
+++ b/plugins/UserCountryMap/javascripts/realtime-map.js
diff --git a/plugins/UserCountryMap/js/vendor/chroma.min.js b/plugins/UserCountryMap/javascripts/vendor/chroma.min.js
index 6e8ed35d5b..6e8ed35d5b 100644
--- a/plugins/UserCountryMap/js/vendor/chroma.min.js
+++ b/plugins/UserCountryMap/javascripts/vendor/chroma.min.js
diff --git a/plugins/UserCountryMap/js/vendor/jquery.qtip.min.js b/plugins/UserCountryMap/javascripts/vendor/jquery.qtip.min.js
index 5e251bc39f..5e251bc39f 100644
--- a/plugins/UserCountryMap/js/vendor/jquery.qtip.min.js
+++ b/plugins/UserCountryMap/javascripts/vendor/jquery.qtip.min.js
diff --git a/plugins/UserCountryMap/js/vendor/kartograph.js b/plugins/UserCountryMap/javascripts/vendor/kartograph.js
index e50442fdc1..e50442fdc1 100644
--- a/plugins/UserCountryMap/js/vendor/kartograph.js
+++ b/plugins/UserCountryMap/javascripts/vendor/kartograph.js
diff --git a/plugins/UserCountryMap/js/vendor/kartograph.min.js b/plugins/UserCountryMap/javascripts/vendor/kartograph.min.js
index 2a6e8ac636..2a6e8ac636 100644
--- a/plugins/UserCountryMap/js/vendor/kartograph.min.js
+++ b/plugins/UserCountryMap/javascripts/vendor/kartograph.min.js
diff --git a/plugins/UserCountryMap/js/vendor/kmeans.js b/plugins/UserCountryMap/javascripts/vendor/kmeans.js
index f4a0d9ca4c..f4a0d9ca4c 100644
--- a/plugins/UserCountryMap/js/vendor/kmeans.js
+++ b/plugins/UserCountryMap/javascripts/vendor/kmeans.js
diff --git a/plugins/UserCountryMap/js/vendor/raphael.min.js b/plugins/UserCountryMap/javascripts/vendor/raphael.min.js
index eeb59152af..eeb59152af 100644
--- a/plugins/UserCountryMap/js/vendor/raphael.min.js
+++ b/plugins/UserCountryMap/javascripts/vendor/raphael.min.js
diff --git a/plugins/UserCountryMap/js/visitor-map.js b/plugins/UserCountryMap/javascripts/visitor-map.js
index 0cd41f0164..0cd41f0164 100644
--- a/plugins/UserCountryMap/js/visitor-map.js
+++ b/plugins/UserCountryMap/javascripts/visitor-map.js
diff --git a/plugins/UserCountryMap/css/map.css b/plugins/UserCountryMap/stylesheets/map.css
index 400e28384d..400e28384d 100644
--- a/plugins/UserCountryMap/css/map.css
+++ b/plugins/UserCountryMap/stylesheets/map.css
diff --git a/plugins/UserCountryMap/css/realtime-map.css b/plugins/UserCountryMap/stylesheets/realtime-map.css
index c9d3aa47b0..c9d3aa47b0 100644
--- a/plugins/UserCountryMap/css/realtime-map.css
+++ b/plugins/UserCountryMap/stylesheets/realtime-map.css
diff --git a/plugins/UserCountryMap/css/visitor-map.css b/plugins/UserCountryMap/stylesheets/visitor-map.css
index cc3340d895..cc3340d895 100644
--- a/plugins/UserCountryMap/css/visitor-map.css
+++ b/plugins/UserCountryMap/stylesheets/visitor-map.css
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index 41334931c2..7c518bca66 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -101,8 +101,8 @@ class Piwik_UsersManager extends Piwik_Plugin
     {
         $jsFiles = & $notification->getNotificationObject();
 
-        $jsFiles[] = "plugins/UsersManager/templates/UsersManager.js";
-        $jsFiles[] = "plugins/UsersManager/templates/userSettings.js";
+        $jsFiles[] = "plugins/UsersManager/javascripts/usersManager.js";
+        $jsFiles[] = "plugins/UsersManager/javascripts/usersSettings.js";
     }
 
     /**
diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/javascripts/usersManager.js
index 0db663d7c2..0db663d7c2 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/javascripts/usersManager.js
diff --git a/plugins/UsersManager/templates/userSettings.js b/plugins/UsersManager/javascripts/usersSettings.js
index 0bfdf3d8bb..0bfdf3d8bb 100644
--- a/plugins/UsersManager/templates/userSettings.js
+++ b/plugins/UsersManager/javascripts/usersSettings.js
diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php
index 6365d61298..2ae9d74e11 100644
--- a/plugins/Widgetize/Widgetize.php
+++ b/plugins/Widgetize/Widgetize.php
@@ -53,10 +53,10 @@ class Piwik_Widgetize extends Piwik_Plugin
 
         $jsFiles[] = "libs/jquery/jquery.truncate.js";
         $jsFiles[] = "libs/jquery/jquery.scrollTo.js";
-        $jsFiles[] = "themes/default/common.js";
-        $jsFiles[] = "plugins/CoreHome/templates/datatable.js";
+        $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js";
+        $jsFiles[] = "plugins/CoreHome/javascripts/datatable.js";
         $jsFiles[] = "plugins/Dashboard/javascripts/widgetMenu.js";
-        $jsFiles[] = "plugins/Widgetize/templates/widgetize.js";
+        $jsFiles[] = "plugins/Widgetize/javascripts/widgetize.js";
     }
 
     /**
@@ -66,9 +66,9 @@ class Piwik_Widgetize extends Piwik_Plugin
     {
         $cssFiles = & $notification->getNotificationObject();
 
-        $cssFiles[] = "plugins/CoreHome/templates/styles.css";
-        $cssFiles[] = "plugins/CoreHome/templates/datatable.css";
-        $cssFiles[] = "plugins/CoreHome/templates/cloud.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/corehome.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/datatable.css";
+        $cssFiles[] = "plugins/CoreHome/stylesheets/cloud.css";
         $cssFiles[] = "plugins/Dashboard/stylesheets/dashboard.css";
     }
 }
diff --git a/plugins/Widgetize/templates/widgetize.js b/plugins/Widgetize/javascripts/widgetize.js
index fb65dc7d02..fb65dc7d02 100644
--- a/plugins/Widgetize/templates/widgetize.js
+++ b/plugins/Widgetize/javascripts/widgetize.js
diff --git a/plugins/Widgetize/templates/iframe.twig b/plugins/Widgetize/templates/iframe.twig
index 6a6ec59e75..5413450d9c 100644
--- a/plugins/Widgetize/templates/iframe.twig
+++ b/plugins/Widgetize/templates/iframe.twig
@@ -10,7 +10,7 @@
         <![endif]-->
         {% include "@CoreHome/js_css_includes.twig" %}
         <!--[if IE]>
-        <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/ieonly.css"/>
+        <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
         <![endif]-->
     </head>
     <body>
diff --git a/plugins/Zeitgeist/theme/ajaxHelper.js b/plugins/Zeitgeist/javascripts/ajaxHelper.js
index accc3501c0..accc3501c0 100644
--- a/plugins/Zeitgeist/theme/ajaxHelper.js
+++ b/plugins/Zeitgeist/javascripts/ajaxHelper.js
diff --git a/plugins/Zeitgeist/theme/common.js b/plugins/Zeitgeist/javascripts/piwikHelper.js
index 2e84968968..2e84968968 100644
--- a/plugins/Zeitgeist/theme/common.js
+++ b/plugins/Zeitgeist/javascripts/piwikHelper.js
diff --git a/plugins/Zeitgeist/theme/common.css b/plugins/Zeitgeist/stylesheets/common.css
index 2d8db49e8b..2d8db49e8b 100644
--- a/plugins/Zeitgeist/theme/common.css
+++ b/plugins/Zeitgeist/stylesheets/common.css
diff --git a/plugins/Zeitgeist/theme/ieonly.css b/plugins/Zeitgeist/stylesheets/ieonly.css
index 125a78b665..125a78b665 100644
--- a/plugins/Zeitgeist/theme/ieonly.css
+++ b/plugins/Zeitgeist/stylesheets/ieonly.css
diff --git a/plugins/Zeitgeist/theme/rtl.css b/plugins/Zeitgeist/stylesheets/rtl.css
index df9c66e7cf..df9c66e7cf 100644
--- a/plugins/Zeitgeist/theme/rtl.css
+++ b/plugins/Zeitgeist/stylesheets/rtl.css
diff --git a/plugins/Zeitgeist/theme/simple_structure.css b/plugins/Zeitgeist/stylesheets/simple_structure.css
index 7d0da3c777..7d0da3c777 100644
--- a/plugins/Zeitgeist/theme/simple_structure.css
+++ b/plugins/Zeitgeist/stylesheets/simple_structure.css
diff --git a/plugins/Zeitgeist/theme/styles.css b/plugins/Zeitgeist/stylesheets/styles.css
index ec12ea6528..ec12ea6528 100644
--- a/plugins/Zeitgeist/theme/styles.css
+++ b/plugins/Zeitgeist/stylesheets/styles.css
diff --git a/plugins/Zeitgeist/theme/admin.twig b/plugins/Zeitgeist/templates/admin.twig
index 003da84420..de3969a148 100644
--- a/plugins/Zeitgeist/theme/admin.twig
+++ b/plugins/Zeitgeist/templates/admin.twig
@@ -15,7 +15,7 @@
             {% include "@CoreHome/js_global_variables.twig" %}
             {% include "@CoreHome/js_css_includes.twig" %}
             <!--[if IE]>
-            <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/ieonly.css"/>
+            <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
             {% include "@CoreHome/iframe_buster_header.twig" %}
         {% endblock %}
diff --git a/plugins/Zeitgeist/theme/ajaxMacros.twig b/plugins/Zeitgeist/templates/ajaxMacros.twig
index 059892706b..059892706b 100644
--- a/plugins/Zeitgeist/theme/ajaxMacros.twig
+++ b/plugins/Zeitgeist/templates/ajaxMacros.twig
diff --git a/plugins/Zeitgeist/theme/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig
index 31c8a2703a..f476227885 100644
--- a/plugins/Zeitgeist/theme/dashboard.twig
+++ b/plugins/Zeitgeist/templates/dashboard.twig
@@ -17,7 +17,7 @@
             <![endif]-->
             {% include "@CoreHome/js_css_includes.twig" %}
             <!--[if IE]>
-            <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/ieonly.css"/>
+            <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
             {% include "@CoreHome/iframe_buster_header.twig" %}
         {% endblock %}
diff --git a/plugins/Zeitgeist/theme/genericForm.twig b/plugins/Zeitgeist/templates/genericForm.twig
index 1c509a9ae5..1c509a9ae5 100644
--- a/plugins/Zeitgeist/theme/genericForm.twig
+++ b/plugins/Zeitgeist/templates/genericForm.twig
diff --git a/plugins/Zeitgeist/theme/javascriptCode.tpl b/plugins/Zeitgeist/templates/javascriptCode.tpl
index 4effa42276..4effa42276 100644
--- a/plugins/Zeitgeist/theme/javascriptCode.tpl
+++ b/plugins/Zeitgeist/templates/javascriptCode.tpl
diff --git a/plugins/Zeitgeist/theme/macros.twig b/plugins/Zeitgeist/templates/macros.twig
index 1429a676f1..1429a676f1 100644
--- a/plugins/Zeitgeist/theme/macros.twig
+++ b/plugins/Zeitgeist/templates/macros.twig
diff --git a/plugins/Zeitgeist/theme/simple_structure_footer.tpl b/plugins/Zeitgeist/templates/simple_structure_footer.tpl
index 9943ff0f85..9943ff0f85 100644
--- a/plugins/Zeitgeist/theme/simple_structure_footer.tpl
+++ b/plugins/Zeitgeist/templates/simple_structure_footer.tpl
diff --git a/plugins/Zeitgeist/theme/simple_structure_header.tpl b/plugins/Zeitgeist/templates/simple_structure_header.tpl
index ee85932856..364ab16fb3 100644
--- a/plugins/Zeitgeist/theme/simple_structure_header.tpl
+++ b/plugins/Zeitgeist/templates/simple_structure_header.tpl
@@ -5,7 +5,7 @@
 	<title>{$HTML_TITLE}</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico" />
-	<link rel="stylesheet" type="text/css" href="themes/default/simple_structure.css" />
+	<link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/simple_structure.css" />
 </head>
 <body id="simple">
 <div id="contentsimple">