diff --git a/data/TWiki/GoogleAnalyticsPlugin.txt b/data/System/GoogleAnalyticsPlugin.txt
similarity index 98%
rename from data/TWiki/GoogleAnalyticsPlugin.txt
rename to data/System/GoogleAnalyticsPlugin.txt
index 183e69b..c896865 100644
--- a/data/TWiki/GoogleAnalyticsPlugin.txt
+++ b/data/System/GoogleAnalyticsPlugin.txt
@@ -33,7 +33,7 @@ __Note:__ You do not need to install anything on the browser to use this plugin.
 	* Download the ZIP file from the Plugin web (see below)
 	* Unzip ==%TOPIC%.zip== in your root ($TWIKI_ROOT) directory. Content:
    | *File:* | *Description:* |
-   | ==data/TWiki/GoogleAnalyticsPlugin.txt== |  |
+   | ==data/System/GoogleAnalyticsPlugin.txt== |  |
    | ==lib/Foswiki/Plugins/GoogleAnalyticsPlugin/build.pl== |  |
 
 	* Optionally, if it exists, run ==%TOPIC%_installer== to automatically check and install other TWiki modules that this module depends on. You can also do this step manually.
diff --git a/lib/TWiki/Plugins/GoogleAnalyticsPlugin.pm b/lib/Foswiki/Plugins/GoogleAnalyticsPlugin.pm
similarity index 75%
rename from lib/TWiki/Plugins/GoogleAnalyticsPlugin.pm
rename to lib/Foswiki/Plugins/GoogleAnalyticsPlugin.pm
index f6dcd6d..ad80643 100644
--- a/lib/TWiki/Plugins/GoogleAnalyticsPlugin.pm
+++ b/lib/Foswiki/Plugins/GoogleAnalyticsPlugin.pm
@@ -1,4 +1,4 @@
-package TWiki::Plugins::GoogleAnalyticsPlugin;
+package Foswiki::Plugins::GoogleAnalyticsPlugin;
 
 use strict;
 
@@ -21,15 +21,15 @@ sub initPlugin {
     my( $topic, $web, $user, $installWeb ) = @_;
 
     # check for Plugins.pm versions
-    if( $TWiki::Plugins::VERSION < 1.1 ) {
-        TWiki::Func::writeWarning( "Version mismatch between $pluginName and Plugins.pm" );
+    if( $Foswiki::Plugins::VERSION < 1.1 ) {
+        Foswiki::Func::writeWarning( "Version mismatch between $pluginName and Plugins.pm" );
         return 0;
     }
     
-    $debug = TWiki::Func::getPluginPreferencesFlag( "DEBUG" );
+    $debug = Foswiki::Func::getPluginPreferencesFlag( "DEBUG" );
     # Get plugin preferences, variables defined by:
     #   * Set GOOGLESITEKEY = ...
-	$googleSiteKey = TWiki::Func::getPluginPreferencesValue( "GOOGLESITEKEY" );
+	$googleSiteKey = Foswiki::Func::getPluginPreferencesValue( "GOOGLESITEKEY" );
 
 	_addToHead();
     return 1;
@@ -50,7 +50,7 @@ sendStats();
 // ]]>
 </script>
 ';
-	TWiki::Func::addToHEAD('GOOGLEANALYTICSPLUGIN',$header)
+	Foswiki::Func::addToHEAD('GOOGLEANALYTICSPLUGIN',$header)
 }
 
 1;
diff --git a/lib/TWiki/Plugins/GoogleAnalyticsPlugin/DEPENDENCIES b/lib/Foswiki/Plugins/GoogleAnalyticsPlugin/DEPENDENCIES
similarity index 100%
rename from lib/TWiki/Plugins/GoogleAnalyticsPlugin/DEPENDENCIES
rename to lib/Foswiki/Plugins/GoogleAnalyticsPlugin/DEPENDENCIES
diff --git a/lib/Foswiki/Plugins/GoogleAnalyticsPlugin/MANIFEST b/lib/Foswiki/Plugins/GoogleAnalyticsPlugin/MANIFEST
new file mode 100644
index 0000000..57ee075
--- /dev/null
+++ b/lib/Foswiki/Plugins/GoogleAnalyticsPlugin/MANIFEST
@@ -0,0 +1,5 @@
+data/System/GoogleAnalyticsPlugin.txt 0664
+lib/Foswiki/Plugins/GoogleAnalyticsPlugin.pm 0664
+pub/System/GoogleAnalyticsPlugin/Google_Analytics_Dashboard.png 0664
+pub/System/GoogleAnalyticsPlugin/Google_Analytics_Dashboard_small.jpg 0664
+
diff --git a/lib/TWiki/Plugins/GoogleAnalyticsPlugin/build.pl b/lib/Foswiki/Plugins/GoogleAnalyticsPlugin/build.pl
similarity index 74%
rename from lib/TWiki/Plugins/GoogleAnalyticsPlugin/build.pl
rename to lib/Foswiki/Plugins/GoogleAnalyticsPlugin/build.pl
index aed909a..9a33a82 100755
--- a/lib/TWiki/Plugins/GoogleAnalyticsPlugin/build.pl
+++ b/lib/Foswiki/Plugins/GoogleAnalyticsPlugin/build.pl
@@ -8,10 +8,10 @@ BEGIN
   }
 }
 
-use TWiki::Contrib::Build;
+use Foswiki::Contrib::Build;
 
 # Create the build object
-$build = new TWiki::Contrib::Build( 'GoogleAnalyticsPlugin' );
+$build = new Foswiki::Contrib::Build( 'GoogleAnalyticsPlugin' );
 
 # Build the target on the command line, or the default target
 $build->build($build->{target});
diff --git a/lib/TWiki/Plugins/GoogleAnalyticsPlugin/MANIFEST b/lib/TWiki/Plugins/GoogleAnalyticsPlugin/MANIFEST
deleted file mode 100644
index 3f57586..0000000
--- a/lib/TWiki/Plugins/GoogleAnalyticsPlugin/MANIFEST
+++ /dev/null
@@ -1,5 +0,0 @@
-data/TWiki/GoogleAnalyticsPlugin.txt 0664
-lib/TWiki/Plugins/GoogleAnalyticsPlugin.pm 0664
-pub/TWiki/GoogleAnalyticsPlugin/Google_Analytics_Dashboard.png 0664
-pub/TWiki/GoogleAnalyticsPlugin/Google_Analytics_Dashboard_small.jpg 0664
-
diff --git a/pub/TWiki/GoogleAnalyticsPlugin/Google_Analytics_Dashboard.png b/pub/System/GoogleAnalyticsPlugin/Google_Analytics_Dashboard.png
similarity index 100%
rename from pub/TWiki/GoogleAnalyticsPlugin/Google_Analytics_Dashboard.png
rename to pub/System/GoogleAnalyticsPlugin/Google_Analytics_Dashboard.png
diff --git a/pub/TWiki/GoogleAnalyticsPlugin/Google_Analytics_Dashboard_small.jpg b/pub/System/GoogleAnalyticsPlugin/Google_Analytics_Dashboard_small.jpg
similarity index 100%
rename from pub/TWiki/GoogleAnalyticsPlugin/Google_Analytics_Dashboard_small.jpg
rename to pub/System/GoogleAnalyticsPlugin/Google_Analytics_Dashboard_small.jpg