Removing extra namespace \Core

119 files changed, 215 insertions, 206 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index 16cba3ce4e..2dc0ce766d 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -8,8 +8,11 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
+use Piwik\Config;
+
+require_once PIWIK_INCLUDE_PATH . '/core/Config.php';
 
 /**
  * @package Piwik_API
@@ -553,7 +556,7 @@ class Piwik_API_API
         }
 
         $urls = array_map('urldecode', $urls);
-        $urls = array_map(array('Piwik\Core\Common', 'unsanitizeInputValue'), $urls);
+        $urls = array_map(array('Piwik\Common', 'unsanitizeInputValue'), $urls);
 
         $result = array();
         foreach ($urls as $url) {
@@ -629,7 +632,7 @@ class Piwik_API_API
         arsort($values);
         $values = array_keys($values);
 
-        $values = array_map(array('Piwik\Core\Common', 'unsanitizeInputValue'), $values);
+        $values = array_map(array('Piwik\Common', 'unsanitizeInputValue'), $values);
 
         $values = array_slice($values, 0, $maxSuggestionsToReturn);
         return $values;
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index c18bfc3e85..16d8f9dd1f 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
-use Piwik\Core\Config;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 2417a558ab..70b51f91a5 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -1,6 +1,6 @@
 <?php
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index f0eca1b190..ba6a63bdb8 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * This class generates a Row evolution dataset, from input request
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 0f81d9d148..695e8f5a90 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Actions
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The Actions API lets you request reports for all your Visitor Actions: Page URLs, Page titles (Piwik Events),
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 2ab5dfb2d1..103672f37b 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Actions
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Actions plugin
diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php
index 0fa1f4f0e2..c4a2bf24af 100644
--- a/plugins/Actions/Archiver.php
+++ b/plugins/Actions/Archiver.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Actions
  */
-use Piwik\Core\Config;
+use Piwik\Config;
 
 /**
  * Class encapsulating logic to process Day/Period Archiving for the Actions reports
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index 37e9e99122..72342adff7 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Actions
  */
-use Piwik\Core\Config;
+use Piwik\Config;
 
 /**
  * This static class provides:
diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php
index a8b0508e0b..92dd4f18e4 100755
--- a/plugins/Annotations/API.php
+++ b/plugins/Annotations/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Annotations
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @see plugins/Annotations/AnnotationList.php
diff --git a/plugins/Annotations/AnnotationList.php b/plugins/Annotations/AnnotationList.php
index 7201b180bb..0b0ca1ea44 100755
--- a/plugins/Annotations/AnnotationList.php
+++ b/plugins/Annotations/AnnotationList.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Annotations
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * This class can be used to query & modify annotations for multiple sites
diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
index 08defbc614..f632ab5ae8 100755
--- a/plugins/Annotations/Controller.php
+++ b/plugins/Annotations/Controller.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Annotations
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * Controller for the Annotations plugin.
diff --git a/plugins/AnonymizeIP/AnonymizeIP.php b/plugins/AnonymizeIP/AnonymizeIP.php
index 7194a055fa..a835a91d8a 100644
--- a/plugins/AnonymizeIP/AnonymizeIP.php
+++ b/plugins/AnonymizeIP/AnonymizeIP.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_AnonymizeIP
  */
-use Piwik\Core\Config;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Common;
 
 /**
  * Anonymize visitor IP addresses to comply with the privacy laws/guidelines in countries, such as Germany.
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index 697ad3ca47..d192c17ca7 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreAdminHome
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @package Piwik_CoreAdminHome
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 41e7898611..1cc8afb6c4 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -8,9 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreAdminHome
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index 41bf84048a..110feb03b6 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreAdminHome
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index 2dbe933fe5..d6afe9e354 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreHome
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
index c617a77ff3..e8625a2e07 100644
--- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreHome
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * MULTI ROW EVOLUTION
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
index 7b15f9c887..4ca8bb6af3 100644
--- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreHome
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * ROW EVOLUTION
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index b5bce55327..85f8143063 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_CorePluginsAdmin
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
index 5cf7824d3d..c7e856b91e 100644
--- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php
+++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CorePluginsAdmin
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 8744d4e651..98f7d968fb 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -8,9 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreUpdater
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 6f14121fba..efc971908a 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreUpdater
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index 1e2c6c74ba..89eaf7821a 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -1,5 +1,7 @@
 <?php
-use Piwik\Core\Common;
+use Piwik\Common;
+use Piwik\Config;
+
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php
index 0610b4573d..0c4a4d1e53 100644
--- a/plugins/DBStats/API.php
+++ b/plugins/DBStats/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_DBStats
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @see plugins/DBStats/MySQLMetadataProvider.php
diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
index e6c93ef5e0..ebad0c031e 100644
--- a/plugins/DBStats/Controller.php
+++ b/plugins/DBStats/Controller.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_DBStats
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index 03e4409af4..fd649d5b1e 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_DBStats
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php
index 75ca12e6ac..9641d2d788 100755
--- a/plugins/DBStats/MySQLMetadataProvider.php
+++ b/plugins/DBStats/MySQLMetadataProvider.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_DBStats
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Utility class that provides general information about databases, including the size of
diff --git a/plugins/Dashboard/API.php b/plugins/Dashboard/API.php
index dea5f45526..83a5c0b804 100644
--- a/plugins/Dashboard/API.php
+++ b/plugins/Dashboard/API.php
@@ -7,7 +7,7 @@
  * @category Piwik_Plugins
  * @package  Piwik_Dashboard
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 
 /**
diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
index 309b7a73a7..f91718d097 100644
--- a/plugins/Dashboard/Controller.php
+++ b/plugins/Dashboard/Controller.php
@@ -7,8 +7,8 @@
  * @category Piwik_Plugins
  * @package  Piwik_Dashboard
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Dashboard Controller
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index 972804a950..6c8a4830b1 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Dashboard
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @package Piwik_Dashboard
diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php
index 9548a53764..789afccc96 100644
--- a/plugins/DevicesDetection/API.php
+++ b/plugins/DevicesDetection/API.php
@@ -9,7 +9,7 @@
  * @category Piwik_Plugins
  * @package Piwik_DevicesDetection
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * The DevicesDetection API lets you access reports on your visitors devices, brands, models, Operating system, Browsers.
diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php
index 6aac50450c..ae94f95375 100644
--- a/plugins/DevicesDetection/Controller.php
+++ b/plugins/DevicesDetection/Controller.php
@@ -1,6 +1,6 @@
 <?php
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 74ee758854..2a734b24e4 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -9,8 +9,8 @@
  * @category Piwik_Plugins
  * @package Piwik_DevicesDetection
  */
-use Piwik\Core\Config;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Common;
 
 require_once PIWIK_INCLUDE_PATH . "/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php";
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
@@ -225,8 +225,8 @@ class Piwik_DevicesDetection extends Piwik_Plugin
         }
 
         $visitorInfo = array_merge($visitorInfo, $deviceInfo);
-        printDebug("Device Detection:");
-        printDebug($deviceInfo);
+        Common::printDebug("Device Detection:");
+        Common::printDebug($deviceInfo);
     }
 
     public function archiveDay(Piwik_ArchiveProcessor_Day $archiveProcessor)
diff --git a/plugins/DoNotTrack/DoNotTrack.php b/plugins/DoNotTrack/DoNotTrack.php
index 59c2ee95db..2b8409d394 100644
--- a/plugins/DoNotTrack/DoNotTrack.php
+++ b/plugins/DoNotTrack/DoNotTrack.php
@@ -36,12 +36,12 @@ class Piwik_DoNotTrack extends Piwik_Plugin
             $request = new Piwik_Tracker_Request($_REQUEST);
             $ua = $request->getUserAgent();
             if (strpos($ua, 'MSIE 10') !== false) {
-                printDebug("INTERNET EXPLORER 10 Enables DNT by default, so Piwik ignores DNT for all IE10 browsers...");
+                Common::printDebug("INTERNET EXPLORER 10 Enables DNT by default, so Piwik ignores DNT for all IE10 browsers...");
                 return;
             }
 
             $exclude = true;
-            printDebug("DoNotTrack found.");
+            Common::printDebug("DoNotTrack found.");
 
             $trackingCookie = Piwik_Tracker_IgnoreCookie::getTrackingCookie();
             $trackingCookie->delete();
diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php
index 185aa2174d..163d265c27 100644
--- a/plugins/ExampleAPI/API.php
+++ b/plugins/ExampleAPI/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_ExampleAPI
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * The ExampleAPI is useful to developers building a custom Piwik plugin.
diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php
index 45857cbc0b..1bcb01479b 100644
--- a/plugins/ExamplePlugin/Controller.php
+++ b/plugins/ExamplePlugin/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_ExamplePlugin
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php
index 597dea4c0f..5ee8ffddd7 100644
--- a/plugins/ExampleUI/Controller.php
+++ b/plugins/ExampleUI/Controller.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_ExampleUI
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * @package Piwik_ExampleUI
diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index 3ba8fa5b5a..243a36bacd 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -8,9 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_Feedback
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index bddaf7b98e..3249a3ac1e 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Goals
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Goals API lets you Manage existing goals, via "updateGoal" and "deleteGoal", create new Goals via "addGoal",
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index ea38907bae..93bdd66b89 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Goals
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 9549dc2fb1..e612295dc1 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Goals
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
index c240a04ecc..4087b7a18d 100644
--- a/plugins/ImageGraph/API.php
+++ b/plugins/ImageGraph/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_ImageGraph
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The ImageGraph.get API call lets you generate beautiful static PNG Graphs for any existing Piwik report.
diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php
index 4cabcd9633..cd7700ef23 100644
--- a/plugins/ImageGraph/Controller.php
+++ b/plugins/ImageGraph/Controller.php
@@ -1,6 +1,6 @@
 <?php
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
index dfccc799bb..60ff3dc27c 100644
--- a/plugins/ImageGraph/ImageGraph.php
+++ b/plugins/ImageGraph/ImageGraph.php
@@ -1,5 +1,5 @@
 <?php
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index cf676dbd7f..7e24ebc155 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Installation
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Installation controller
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 0136c1a20e..d10f3b5a49 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Installation
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/Installation/FormGeneralSetup.php b/plugins/Installation/FormGeneralSetup.php
index 61267e390a..23f1dbce94 100644
--- a/plugins/Installation/FormGeneralSetup.php
+++ b/plugins/Installation/FormGeneralSetup.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Installation
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 20af4fb892..1d81de1393 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Installation
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
index 14fb3ea7f5..bda2419908 100644
--- a/plugins/LanguagesManager/API.php
+++ b/plugins/LanguagesManager/API.php
@@ -9,8 +9,8 @@
  * @package Piwik_LanguagesManager
  *
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The LanguagesManager API lets you access existing Piwik translations, and change Users languages preferences.
diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php
index 53dd6494c5..6685b511e4 100644
--- a/plugins/LanguagesManager/Controller.php
+++ b/plugins/LanguagesManager/Controller.php
@@ -9,8 +9,8 @@
  * @package Piwik_LanguagesManager
  *
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @package Piwik_LanguagesManager
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 073e7a1231..da096266b5 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -9,9 +9,9 @@
  * @package Piwik_LanguagesManager
  *
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 6c4e7ba046..27652141d1 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -8,9 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_Live
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @see plugins/Referers/functions.php
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 13e02a5d7d..bad3a1bcbf 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Live
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @package Piwik_Live
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 800e8ec914..e10b1ea331 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Live
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @see plugins/Referers/functions.php
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index 20eae5f377..e8de6d3c38 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Login
  */
-use Piwik\Core\Config;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 6e429788eb..013658b419 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -8,8 +8,10 @@
  * @category Piwik_Plugins
  * @package Piwik_Login
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+
+require_once PIWIK_INCLUDE_PATH . '/core/Config.php';
 
 /**
  * Login controller
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 59f9d63f8f..a46bf6e387 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Login
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
+use Piwik\Config;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php
index 52073993b0..491bb46f86 100644
--- a/plugins/MobileMessaging/API.php
+++ b/plugins/MobileMessaging/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_MobileMessaging
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The MobileMessaging API lets you manage and access all the MobileMessaging plugin features including :
diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php
index 84893cb172..a97641ed0c 100644
--- a/plugins/MobileMessaging/Controller.php
+++ b/plugins/MobileMessaging/Controller.php
@@ -9,8 +9,8 @@
  * @package Piwik_MobileMessaging
  */
 
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
 
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index 62debf52e6..22ae5f0d40 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_MobileMessaging
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php
index c871e6632a..d752b50e84 100644
--- a/plugins/MobileMessaging/ReportRenderer/Sms.php
+++ b/plugins/MobileMessaging/ReportRenderer/Sms.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_MobileMessaging_ReportRenderer
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 
 /**
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 433263ebb8..cb83dd2112 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_MultiSites
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The MultiSites API lets you request the key metrics (visits, page views, revenue) for all Websites in Piwik.
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index a6634df68f..107f1923ce 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -8,8 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_MultiSites
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
+use Piwik\Config;
 
 /**
  *
diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php
index 812a792e14..83db709503 100644
--- a/plugins/Overlay/API.php
+++ b/plugins/Overlay/API.php
@@ -1,6 +1,6 @@
 <?php
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
+use Piwik\Config;
+use Piwik\Piwik;
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
index e08218a23f..d875fa97a7 100644
--- a/plugins/Overlay/Controller.php
+++ b/plugins/Overlay/Controller.php
@@ -1,6 +1,6 @@
 <?php
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php
index f63225450c..f177eaf4e7 100644
--- a/plugins/PDFReports/API.php
+++ b/plugins/PDFReports/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_PDFReports
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The PDFReports API lets you manage Scheduled Email reports, as well as generate, download or email any existing report.
diff --git a/plugins/PDFReports/Controller.php b/plugins/PDFReports/Controller.php
index 2f8a5a9d83..4e7e8c1644 100644
--- a/plugins/PDFReports/Controller.php
+++ b/plugins/PDFReports/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_PDFReports
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php
index 9332020010..9130c2e291 100644
--- a/plugins/PDFReports/PDFReports.php
+++ b/plugins/PDFReports/PDFReports.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_PDFReports
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index 049f3a1ec8..d7191339da 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -8,9 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_PrivacyManager
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/PrivacyManager/LogDataPurger.php b/plugins/PrivacyManager/LogDataPurger.php
index 692d8435e2..ac899a6ce4 100755
--- a/plugins/PrivacyManager/LogDataPurger.php
+++ b/plugins/PrivacyManager/LogDataPurger.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_PrivacyManager
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Purges the log_visit, log_conversion and related tables of old visit data.
diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php
index 9553275c8a..59836dae9a 100644
--- a/plugins/PrivacyManager/PrivacyManager.php
+++ b/plugins/PrivacyManager/PrivacyManager.php
@@ -8,9 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_PrivacyManager
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @see plugins/PrivacyManager/LogDataPurger.php
diff --git a/plugins/PrivacyManager/ReportsPurger.php b/plugins/PrivacyManager/ReportsPurger.php
index 49938dd33d..db4e5cafe3 100755
--- a/plugins/PrivacyManager/ReportsPurger.php
+++ b/plugins/PrivacyManager/ReportsPurger.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_PrivacyManager
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * Purges archived reports and metrics that are considered old.
diff --git a/plugins/Provider/API.php b/plugins/Provider/API.php
index 687527d571..20408c70b8 100644
--- a/plugins/Provider/API.php
+++ b/plugins/Provider/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Provider
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @see plugins/Provider/functions.php
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index b785229214..ca7c05ae8d 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Provider
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  *
@@ -111,7 +111,7 @@ class Piwik_Provider extends Piwik_Plugin
 
         // In case the IP was anonymized, we should not continue since the DNS reverse lookup will fail and this will slow down tracking
         if (substr($ip, -2, 2) == '.0') {
-            printDebug("IP Was anonymized so we skip the Provider DNS reverse lookup...");
+            Common::printDebug("IP Was anonymized so we skip the Provider DNS reverse lookup...");
             return;
         }
 
diff --git a/plugins/Provider/functions.php b/plugins/Provider/functions.php
index 36dc488a99..a09ec1ab36 100644
--- a/plugins/Provider/functions.php
+++ b/plugins/Provider/functions.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Provider
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * Return hostname portion of a domain name
diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index b97e61471c..f7f71bb8a8 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Proxy
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Controller for proxy services
diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php
index 39ad371b43..7620cfd668 100644
--- a/plugins/Referers/API.php
+++ b/plugins/Referers/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Referers
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The Referrers API lets you access reports about Websites, Search engines, Keywords, Campaigns used to access your website.
diff --git a/plugins/Referers/Archiver.php b/plugins/Referers/Archiver.php
index 8dd540a478..42af90b320 100644
--- a/plugins/Referers/Archiver.php
+++ b/plugins/Referers/Archiver.php
@@ -1,5 +1,6 @@
 <?php
-use Piwik\Core\Common;
+use Piwik\Common;
+use Piwik\Config;
 
 /**
  * Piwik - Open source web analytics
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index df592528c1..8abcfb7062 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Referers
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php
index e4feb4d186..c96ca7927d 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referers/Referers.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Referers
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @see plugins/Referers/functions.php
diff --git a/plugins/Referers/functions.php b/plugins/Referers/functions.php
index 7ba0b6f776..b7038fb360 100644
--- a/plugins/Referers/functions.php
+++ b/plugins/Referers/functions.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Referers
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * Returns path component from a URL
diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php
index 9e1d8c1713..b7826f30d5 100644
--- a/plugins/SEO/API.php
+++ b/plugins/SEO/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SEO
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @see plugins/Referers/functions.php
diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php
index 9e9945de83..c09ce235d1 100644
--- a/plugins/SEO/Controller.php
+++ b/plugins/SEO/Controller.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SEO
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * @package Piwik_SEO
diff --git a/plugins/SEO/MajesticClient.php b/plugins/SEO/MajesticClient.php
index 2e0b2ee5e6..250fa0025b 100644
--- a/plugins/SEO/MajesticClient.php
+++ b/plugins/SEO/MajesticClient.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SEO
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * Client for Majestic SEO's HTTP API.
diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php
index fabd770118..ddc3f5117d 100644
--- a/plugins/SEO/RankChecker.php
+++ b/plugins/SEO/RankChecker.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SEO
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * The functions below are derived/adapted from GetRank.org's
diff --git a/plugins/SecurityInfo/Controller.php b/plugins/SecurityInfo/Controller.php
index fd66acc99a..c9b307bba4 100644
--- a/plugins/SecurityInfo/Controller.php
+++ b/plugins/SecurityInfo/Controller.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SecurityInfo
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @package Piwik_SecurityInfo
diff --git a/plugins/SecurityInfo/SecurityInfo.php b/plugins/SecurityInfo/SecurityInfo.php
index 04537325cf..ecd8d2e5f6 100644
--- a/plugins/SecurityInfo/SecurityInfo.php
+++ b/plugins/SecurityInfo/SecurityInfo.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SecurityInfo
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php
index 7d90bee310..c3c04a054e 100644
--- a/plugins/SegmentEditor/API.php
+++ b/plugins/SegmentEditor/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_SegmentEditor
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The SegmentEditor API lets you add, update, delete custom Segments, and list saved segments.a
diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php
index b48374deb1..bafab7ac46 100644
--- a/plugins/SegmentEditor/Controller.php
+++ b/plugins/SegmentEditor/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_SegmentEditor
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @package Piwik_SegmentEditor
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index 41b79dcd1d..94eefc117d 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SegmentEditor
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * @package Piwik_SegmentEditor
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 19a8db3d2e..1400d50008 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_SitesManager
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The SitesManager API gives you full control on Websites in Piwik (create, update and delete), and many methods to retrieve websites based on various attributes.
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index eca7970aca..c6e518dbc9 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_SitesManager
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 79fa7f7701..8fbad87b00 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_SitesManager
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 2b35a6e271..739d07af7d 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_Transitions
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @package Piwik_Transitions
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index b89b557448..4c146e879b 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @see plugins/UserCountry/functions.php
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 355f771e68..bda89e927b 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php
index febeccdee0..6b63142cfa 100755
--- a/plugins/UserCountry/GeoIPAutoUpdater.php
+++ b/plugins/UserCountry/GeoIPAutoUpdater.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * Used to automatically update installed GeoIP databases, and manages the updater's
diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php
index d05fbfba76..153247a252 100755
--- a/plugins/UserCountry/LocationProvider.php
+++ b/plugins/UserCountry/LocationProvider.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  * @see plugins/UserCountry/LocationProvider/Default.php
diff --git a/plugins/UserCountry/LocationProvider/Default.php b/plugins/UserCountry/LocationProvider/Default.php
index 18ef73ce3e..a7798a5ca0 100755
--- a/plugins/UserCountry/LocationProvider/Default.php
+++ b/plugins/UserCountry/LocationProvider/Default.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
-use Piwik\Core\Config;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Common;
 
 /**
  * The default LocationProvider, this LocationProvider guesses a visitor's country
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
index 5e2e1f71e8..001b7f8c4e 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * A LocationProvider that uses the PHP implementation of GeoIP.
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
index cdafeefa6a..a26217bac2 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
@@ -69,7 +69,7 @@ class Piwik_UserCountry_LocationProvider_GeoIp_ServerBased extends Piwik_UserCou
             && (!isset($info['disable_fallbacks'])
                 || !$info['disable_fallbacks'])
         ) {
-            printDebug("The request is for IP address: " . $info['ip'] . " but your IP is: $myIP. GeoIP Server Module (apache/nginx) does not support this use case... ");
+            Common::printDebug("The request is for IP address: " . $info['ip'] . " but your IP is: $myIP. GeoIP Server Module (apache/nginx) does not support this use case... ");
             $fallbacks = array(
                 Piwik_UserCountry_LocationProvider_GeoIp_Pecl::ID,
                 Piwik_UserCountry_LocationProvider_GeoIp_Php::ID
@@ -77,11 +77,11 @@ class Piwik_UserCountry_LocationProvider_GeoIp_ServerBased extends Piwik_UserCou
             foreach ($fallbacks as $fallbackProviderId) {
                 $otherProvider = Piwik_UserCountry_LocationProvider::getProviderById($fallbackProviderId);
                 if ($otherProvider) {
-                    printDebug("Used $fallbackProviderId to detect this visitor IP");
+                    Common::printDebug("Used $fallbackProviderId to detect this visitor IP");
                     return $otherProvider->getLocation($info);
                 }
             }
-            printDebug("FAILED to lookup the geo location of this IP address, as no fallback location providers is configured. We recommend to configure Geolocation PECL module to fix this error.");
+            Common::printDebug("FAILED to lookup the geo location of this IP address, as no fallback location providers is configured. We recommend to configure Geolocation PECL module to fix this error.");
 
             return false;
         }
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 3171a92e7c..d6e673e697 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * @see plugins/UserCountry/GeoIPAutoUpdater.php
@@ -69,7 +69,7 @@ class Piwik_UserCountry extends Piwik_Plugin
         if ($provider === false) {
             $id = Piwik_UserCountry_LocationProvider_Default::ID;
             $provider = Piwik_UserCountry_LocationProvider::getProviderById($id);
-            printDebug("GEO: no current location provider sent, falling back to default '$id' one.");
+            Common::printDebug("GEO: no current location provider sent, falling back to default '$id' one.");
         }
 
         $location = $provider->getLocation($visitorInfo);
@@ -79,10 +79,10 @@ class Piwik_UserCountry extends Piwik_Plugin
             $defaultId = Piwik_UserCountry_LocationProvider_Default::ID;
             $provider = Piwik_UserCountry_LocationProvider::getProviderById($defaultId);
             $location = $provider->getLocation($visitorInfo);
-            printDebug("GEO: couldn't find a location with Geo Module '$id', using Default '$defaultId' provider as fallback...");
+            Common::printDebug("GEO: couldn't find a location with Geo Module '$id', using Default '$defaultId' provider as fallback...");
             $id = $defaultId;
         }
-        printDebug("GEO: Found IP location (provider '" . $id . "'): " . var_export($location, true));
+        Common::printDebug("GEO: Found IP location (provider '" . $id . "'): " . var_export($location, true));
     }
 
     function addWidgets()
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 6eee81eed6..08989db237 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountryMap
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 23a538e7f1..2a8c7584de 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UserSettings
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @see plugins/UserSettings/functions.php
diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php
index 95f7f5f107..cdfd893faf 100644
--- a/plugins/UserSettings/Archiver.php
+++ b/plugins/UserSettings/Archiver.php
@@ -9,7 +9,7 @@
  * @package Piwik_UserSettings
  */
 
-use Piwik\Core\Common;
+use Piwik\Common;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php';
 
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index 8adc92b245..86164eb5a1 100644
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UserSettings
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * @see libs/UserAgentParser/UserAgentParser.php
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index 0ed1aaf7aa..3a804c70f0 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -8,9 +8,9 @@
  * @category Piwik_Plugins
  * @package Piwik_UsersManager
  */
-use Piwik\Core\Config;
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Config;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  * The UsersManager API lets you Manage Users and their permissions to access specific websites.
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index ac3aaab360..9c8cae77ca 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_UsersManager
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index 82d02f36bf..58f585da67 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UsersManager
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * Manage Piwik users
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index 5b7161b7be..49473b5192 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitFrequency
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * VisitFrequency API lets you access a list of metrics related to Returning Visitors.
diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php
index 6cac26d504..c9362959cc 100644
--- a/plugins/VisitFrequency/Controller.php
+++ b/plugins/VisitFrequency/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitFrequency
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index f473ae6ab3..05dad866b9 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitTime
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * VisitTime API lets you access reports by Hour (Server time), and by Hour Local Time of your visitors.
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 990bf350e3..dad9c46fec 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitTime
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/VisitorGenerator/Controller.php b/plugins/VisitorGenerator/Controller.php
index 813984b2ed..606e8784c7 100644
--- a/plugins/VisitorGenerator/Controller.php
+++ b/plugins/VisitorGenerator/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitorGenerator
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/VisitorGenerator/VisitorGenerator.php b/plugins/VisitorGenerator/VisitorGenerator.php
index dc23e4f60d..7423f3a900 100644
--- a/plugins/VisitorGenerator/VisitorGenerator.php
+++ b/plugins/VisitorGenerator/VisitorGenerator.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitorGenerator
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  *
diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php
index 35e89c9896..33251a7232 100644
--- a/plugins/VisitorInterest/API.php
+++ b/plugins/VisitorInterest/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitorInterest
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * VisitorInterest API lets you access two Visitor Engagement reports: number of visits per number of pages,
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index a7c0ecda71..6e4399c384 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitsSummary
  */
-use Piwik\Core\Piwik;
+use Piwik\Piwik;
 
 /**
  * VisitsSummary API lets you access the core web analytics metrics (visits, unique visitors,
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 02ab257ac5..8a4552f473 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -8,8 +8,8 @@
  * @category Piwik_Plugins
  * @package Piwik_VisitsSummary
  */
-use Piwik\Core\Piwik;
-use Piwik\Core\Common;
+use Piwik\Piwik;
+use Piwik\Common;
 
 /**
  *
diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index be6b56a37b..dad2506936 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -8,7 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Widgetize
  */
-use Piwik\Core\Common;
+use Piwik\Common;
 
 /**
  *