diff --git a/misc/log-analytics/README b/misc/log-analytics/README
deleted file mode 100644
index 82f689516f2..00000000000
--- a/misc/log-analytics/README
+++ /dev/null
@@ -1,175 +0,0 @@
-Piwik Server Log Analytics: Import your server logs in Piwik!
-=============================================================
-
-
-Requirements
-------------
- - This is currently in BETA TESTING. The parameters name and behavior might change
-   until the final stable release. Please use with care, expect bugs, and report your
-   suggestions and advice.
- - Python 2.6 or 2.7. Python 3.x is not supported.
- - Update to Piwik 1.7.2-RC1 or newer
-   Download Piwik RC from: http://builds.piwik.org/piwik-1.7.2-rc1.zip
-
-How to use this script?
------------------------
-The most simple way to import your logs is to run:
-
-    ./import_logs.py --url=piwik.example.com /path/to/access.log
-
-You must specify your Piwik URL with the --url argument.
-The script will automatically read your config.inc.php file to get the authentication
-token and communicate with your Piwik install to import the lines.
-The default mode will try to mimic the Javascript tracker as much as possible,
-and will not track bots, static files, or error requests.
-
-If you wish to track all requests the following command would be used:
-    python /path/to/piwik/misc/log-analytics/import_logs.py --url=http://mysite/piwik/ access.log --idsite=1234 --recorders=4 --enable-http-errors --enable-http-redirects --enable-static --enable-bots
-
-(remember this is BETA release)
-
-How to import your logs automatically every day?
-------------------------------------------------
-You must first make sure your logs are automatically rotated every day. The most
-popular ways to implement this are using either:
-    - logrotate: http://www.linuxcommand.org/man_pages/logrotate8.html
-    It will work with any HTTP daemon.
-    - rotatelogs: http://httpd.apache.org/docs/2.0/programs/rotatelogs.html
-    Only works with Apache.
-    - let us know what else is useful and we will add it to the list
-
-Your logs should be automatically rotated and stored on your webserver, for instance in daily logs
-/var/log/apache/access-%Y-%m-%d.log (where %Y, %m and %d represent the year,
-month and day).
-You can then import your logs automatically each day (at 0:01). Setup a cron job with the command:
-
-    0 1 * * * /path/to/piwik/misc/log-analytics/import-logs.py -u piwik.example.com `date --date=yesterday +/var/log/apache/access-\%Y-\%m-\%d.log`
-
-Performance
------------
-With an Intel Core i5-2400 @ 3.10GHz (2 cores, 4 virtual cores with Hyper-threading),
-running Piwik and its MySQL database, between 250 and 300 records were imported per second.
-
-The import_logs.py script needs CPU to read and parse the log files, but it is actually
-Piwik server itself (i.e. PHP/MySQL) which will use more CPU during data import.
-
-To improve performance,
-(1) by default, the script one thread to parse and import log lines.
-    you can use the --recorders option to specify the number of parallel threads which will
-    import hits into Piwik. We recommend to set --recorders=N to the number N of CPU cores
-    that the server hosting Piwik has. The parsing will still be single-threaded,
-    but several hits will be tracked in Piwik at the same time.
-(2) the script will issue hundreds of requests to piwik.php - to improve the Piwik webserver performance
-    you can disable server access logging for these requests.
-    Each Piwik webserver (Apache, Nginx, IIS) can also be tweaked a bit to handle more req/sec.
-
-
-Setup Apache CustomLog that directly imports in Piwik
------------------------------------------------------
-Since apache CustomLog directives can send log data to a script, it is possible to import hits into piwik server-side in real-time rather than processing a logfile each day.
-
-This approach has many advantages, including real-time data being available on your piwik site, using real logs files instead of relying on client-side Javacsript, and not having a surge of CPU/RAM usage during log processing.
-The disadvantage is that if Piwik is unavailable, logging data will be lost. Therefore we recommend to also log into a standard log file. Bear in mind also that apache processes will wait until a request is logged before processing a new request, so if piwik runs slow so does your site: it's therefore important to tune --recorders to the right level.
-
-In the most basic setup, you might have in your main config section:
-	# Set up your log format as a normal extended format, with hostname at the start
-	LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" myLogFormat
-	# Log to a file as usual
-	CustomLog /path/to/logfile myLogFormat
-	# Log to piwik as well
-	CustomLog "|/path/to/import_logs.py --option1 --option2 ... -" myLogFormat
-
-Note: on Debian/Ubuntu, the default configuration defines the vhost_combined format. You
-can use it instead of defining myLogFormat.
-
-Useful options here are:
---add-sites-new-hosts (creates new websites in piwik based on %v in the LogFormat)
---output=/path/to/piwik.log (puts any output into a log file for reference/debugging later)
---recorders=4 (use whatever value seems sensible for you - higher traffic sites will need more recorders to keep up)
-"-" so it reads straight from /dev/stdin
-
-You can have as many CustomLog statements as you like. However, if you define any CustomLog directives within a <VirtualHost> block, all CustomLogs in the main config will be overridden. Therefore if you require custom logging for particular VirtualHosts, it is recommended to use mod_macro to make configuration more maintainable.
-
-
-Advanced Log Analytics use case: Apache vhost, custom logs, automatic website creation
---------------------------------------------------------------------------------------
-As a rather extreme example of what you can do, here is an apache config with:
- * standard logging in the main config area for the majority of VirtualHosts
- * customised logging in a particular virtualhost to change the hostname (for instance, if a particular virtualhost should be logged as if it were a different site)
- * customised logging in another virtualhost which creates new websites in piwik for subsites (e.g. to have domain.com/subsite1 as a whole website in its own right). This requires setting up a custom --log-format-regex to allow "/" in the hostname section (NB the escaping necessary for apache to pass through the regex to piwik properly), and also to have multiple CustomLog directives so the subsite gets logged to both domain.com and domain.com/subsite1 websites in piwik
- * we also use mod_rewrite to set environment variables so that if you have multiple subsites with the same format , e.g. /subsite1, /subsite2, etc, you can automatically create a new piwik website for each one without having to configure them manually
-
-NB use of mod_macro to ensure consistency and maintainability
-
-Apache configuration source code:
----------------------------------
-	# Set up macro with the options
-	# * $vhost (this will be used as the piwik website name),
-	# * $logname (the name of the LogFormat we're using),
-	# * $output (which logfile to save import_logs.py output to),
-	# * $env (CustomLog can be set only to fire if an environment variable is set - this contains that environment variable, so subsites only log when it's set)
-	# NB the --log-format-regex line is exactly the same regex as import_logs.py's own 'common_vhost' format, but with "\/" added in the "host" section's allowed characters
-	<Macro piwiklog $vhost $logname $output $env>
-	LogFormat "$vhost %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" $logname
-	CustomLog       "|/path/to/piwik/misc/log-analytics/import_logs.py \
-	--add-sites-new-hosts \
-	--config=/path/to/piwik/config/config.ini.php \
-	--url='http://your.piwik.install/' \
-	--recorders=4 \
-	--log-format-regex='(?P<host>[\\\\w\\\\-\\\\.\\\\/]*)(?::\\\\d+)? (?P<ip>\\\\S+) \\\\S+ \\\\S+ \\\\[(?P<date>.*?) (?P<timezone>.*?)\\\\] \\\"\\\\S+ (?P<path>.*?) \\\\S+\\\" (?P<status>\\\\S+) (?P<length>\\\\S+) \\\"(?P<referrer>.*?)\\\" \\\"(?P<user_agent>.*?)\\\"' \
-	--output=/var/log/piwik/$output.log \
-	-" \
-	$logname \
-	$env
-	</Macro>
-
-	# Set up main apache logging, with:
-	# * normal %v as hostname,
-	# * vhost_common as logformat name,
-	# * /var/log/piwik/main.log as the logfile,
-	# * no env variable needed since we always want to trigger
-	Use piwiklog %v vhost_common main " "
-
-	<VirtualHost>
-		ServerName example.com
-		# Set this host to log to piwik with a different hostname (and using a different output file, /var/log/piwik/example_com.log)
-		Use piwiklog "another-host.com" vhost_common example_com " "
-	</VirtualHost>
-
-	<VirtualHost>
-		ServerName domain.com
-		# We want to log this normally, so repeat the CustomLog from the main section
-		# (if this is omitted, our other CustomLogs below will override the one in the main section, so the main site won't be logged)
-		Use piwiklog %v vhost_common main " "
-
-		# Now set up mod_rewrite to detect our subsites and set up new piwik websites to track just hits to these (this is a bit like profiles in Google Analytics).
-		# We want to match domain.com/anothersubsite and domain.com/subsite[0-9]+
-
-		# First to be on the safe side, unset the env we'll use to test if we're in a subsite:
-		UnsetEnv vhostLogName
-
-		# Subsite definitions. NB check for both URI and REFERER (some files used in a page, or downloads linked from a page, may not reside within our subsite directory):
-		# Do the one-off subsite first:
-		RewriteCond %{REQUEST_URI} ^/anothersubsite(/|$) [OR]
-		RewriteCond %{HTTP_REFERER} domain\.com/anothersubsite(/|$)
-		RewriteRule ^/.*        -       [E=vhostLogName:anothersubsite]
-		# Subsite of the form /subsite[0-9]+. NB the capture brackets in the RewriteCond rules which get mapped to %1 in the RewriteRule
-		RewriteCond %{REQUEST_URI} ^/(subsite[0-9]+)(/|$)) [OR]
-		RewriteCond %{HTTP_REFERER} domain\.com/(subsite[0-9]+)(/|$)
-		RewriteRule ^/.*        -       [E=vhostLogName:subsite%1]
-
-		# Now set the logging to piwik setting:
-		# * the hostname to domain.com/<subsitename>
-		# * the logformat to vhost_domain_com_subsites (can be anything so long as it's unique)
-		# * the output to go to /var/log/piwik/domain_com_subsites.log (again, can be anything)
-		# * triggering only when the env variable is set, so requests to other URIs on this domain don't call this logging rule
-		Use piwiklog domain.com/%{vhostLogName}e vhost_domain_com_subsites domain_com_subsites env=vhostLogName
-	</VirtualHost>
-
-
-Nginx Virtual Host Log Format
------------------------------
-This log format can be specified for nginx access logs to capture multiple virtual hosts:
- * log_format vhosts '$host $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
- * access_log /PATH/TO/access.log vhosts;
-When executing import_logs.py specify the "common_complete" format.
diff --git a/misc/log-analytics/README.md b/misc/log-analytics/README.md
new file mode 100644
index 00000000000..dc6867f73c3
--- /dev/null
+++ b/misc/log-analytics/README.md
@@ -0,0 +1,183 @@
+# Piwik Server Log Analytics: Import your server logs in Piwik!
+
+## Requirements
+
+* This is currently in BETA TESTING. The parameters name and behavior might change
+  until the final stable release. Please use with care, expect bugs, and report your
+  suggestions and advice.
+* Python 2.6 or 2.7. Python 3.x is not supported.
+* Update to Piwik 1.7.2-RC1 or newer
+  Download Piwik RC from: http://builds.piwik.org/piwik-1.7.2-rc1.zip
+
+## How to use this script?
+
+The most simple way to import your logs is to run:
+
+    ./import_logs.py --url=piwik.example.com /path/to/access.log
+
+You must specify your Piwik URL with the `--url` argument.
+The script will automatically read your config.inc.php file to get the authentication
+token and communicate with your Piwik install to import the lines.
+The default mode will try to mimic the Javascript tracker as much as possible,
+and will not track bots, static files, or error requests.
+
+If you wish to track all requests the following command would be used:
+
+    python /path/to/piwik/misc/log-analytics/import_logs.py --url=http://mysite/piwik/ access.log --idsite=1234 --recorders=4 --enable-http-errors --enable-http-redirects --enable-static --enable-bots
+
+(remember this is a BETA release)
+
+## How to import your logs automatically every day?
+
+You must first make sure your logs are automatically rotated every day. The most
+popular ways to implement this are using either:
+
+* logrotate: http://www.linuxcommand.org/man_pages/logrotate8.html
+  It will work with any HTTP daemon.
+* rotatelogs: http://httpd.apache.org/docs/2.0/programs/rotatelogs.html
+  Only works with Apache.
+* let us know what else is useful and we will add it to the list
+
+Your logs should be automatically rotated and stored on your webserver, for instance in daily logs
+`/var/log/apache/access-%Y-%m-%d.log` (where %Y, %m and %d represent the year,
+month and day).
+You can then import your logs automatically each day (at 0:01). Setup a cron job with the command:
+
+    0 1 * * * /path/to/piwik/misc/log-analytics/import-logs.py -u piwik.example.com `date --date=yesterday +/var/log/apache/access-\%Y-\%m-\%d.log`
+
+## Performance
+
+With an Intel Core i5-2400 @ 3.10GHz (2 cores, 4 virtual cores with Hyper-threading),
+running Piwik and its MySQL database, between 250 and 300 records were imported per second.
+
+The import_logs.py script needs CPU to read and parse the log files, but it is actually
+Piwik server itself (i.e. PHP/MySQL) which will use more CPU during data import.
+
+To improve performance,
+
+1. by default, the script one thread to parse and import log lines.
+   you can use the `--recorders` option to specify the number of parallel threads which will
+   import hits into Piwik. We recommend to set `--recorders=N` to the number N of CPU cores
+   that the server hosting Piwik has. The parsing will still be single-threaded,
+   but several hits will be tracked in Piwik at the same time.
+2. the script will issue hundreds of requests to piwik.php - to improve the Piwik webserver performance
+   you can disable server access logging for these requests.
+   Each Piwik webserver (Apache, Nginx, IIS) can also be tweaked a bit to handle more req/sec.
+
+
+## Setup Apache CustomLog that directly imports in Piwik
+
+Since apache CustomLog directives can send log data to a script, it is possible to import hits into piwik server-side in real-time rather than processing a logfile each day.
+
+This approach has many advantages, including real-time data being available on your piwik site, using real logs files instead of relying on client-side Javacsript, and not having a surge of CPU/RAM usage during log processing.
+The disadvantage is that if Piwik is unavailable, logging data will be lost. Therefore we recommend to also log into a standard log file. Bear in mind also that apache processes will wait until a request is logged before processing a new request, so if piwik runs slow so does your site: it's therefore important to tune --recorders to the right level.
+
+In the most basic setup, you might have in your main config section:
+
+```
+# Set up your log format as a normal extended format, with hostname at the start
+LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" myLogFormat
+# Log to a file as usual
+CustomLog /path/to/logfile myLogFormat
+# Log to piwik as well
+CustomLog "|/path/to/import_logs.py --option1 --option2 ... -" myLogFormat
+```
+
+Note: on Debian/Ubuntu, the default configuration defines the vhost_combined format. You
+can use it instead of defining myLogFormat.
+
+Useful options here are:
+
+* --add-sites-new-hosts (creates new websites in piwik based on %v in the LogFormat)
+* --output=/path/to/piwik.log (puts any output into a log file for reference/debugging later)
+* --recorders=4 (use whatever value seems sensible for you - higher traffic sites will need more recorders to keep up)
+* "-" so it reads straight from /dev/stdin
+
+You can have as many CustomLog statements as you like. However, if you define any CustomLog directives within a <VirtualHost> block, all CustomLogs in the main config will be overridden. Therefore if you require custom logging for particular VirtualHosts, it is recommended to use mod_macro to make configuration more maintainable.
+
+
+## Advanced Log Analytics use case: Apache vhost, custom logs, automatic website creation
+
+As a rather extreme example of what you can do, here is an apache config with:
+
+* standard logging in the main config area for the majority of VirtualHosts
+* customised logging in a particular virtualhost to change the hostname (for instance, if a particular virtualhost should be logged as if it were a different site)
+* customised logging in another virtualhost which creates new websites in piwik for subsites (e.g. to have domain.com/subsite1 as a whole website in its own right). This requires setting up a custom --log-format-regex to allow "/" in the hostname section (NB the escaping necessary for apache to pass through the regex to piwik properly), and also to have multiple CustomLog directives so the subsite gets logged to both domain.com and domain.com/subsite1 websites in piwik
+* we also use mod_rewrite to set environment variables so that if you have multiple subsites with the same format , e.g. /subsite1, /subsite2, etc, you can automatically create a new piwik website for each one without having to configure them manually
+
+NB use of mod_macro to ensure consistency and maintainability
+
+## Apache configuration source code:
+
+```
+# Set up macro with the options
+# * $vhost (this will be used as the piwik website name),
+# * $logname (the name of the LogFormat we're using),
+# * $output (which logfile to save import_logs.py output to),
+# * $env (CustomLog can be set only to fire if an environment variable is set - this contains that environment variable, so subsites only log when it's set)
+# NB the --log-format-regex line is exactly the same regex as import_logs.py's own 'common_vhost' format, but with "\/" added in the "host" section's allowed characters
+<Macro piwiklog $vhost $logname $output $env>
+LogFormat "$vhost %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" $logname
+CustomLog       "|/path/to/piwik/misc/log-analytics/import_logs.py \
+--add-sites-new-hosts \
+--config=/path/to/piwik/config/config.ini.php \
+--url='http://your.piwik.install/' \
+--recorders=4 \
+--log-format-regex='(?P<host>[\\\\w\\\\-\\\\.\\\\/]*)(?::\\\\d+)? (?P<ip>\\\\S+) \\\\S+ \\\\S+ \\\\[(?P<date>.*?) (?P<timezone>.*?)\\\\] \\\"\\\\S+ (?P<path>.*?) \\\\S+\\\" (?P<status>\\\\S+) (?P<length>\\\\S+) \\\"(?P<referrer>.*?)\\\" \\\"(?P<user_agent>.*?)\\\"' \
+--output=/var/log/piwik/$output.log \
+-" \
+$logname \
+$env
+</Macro>
+# Set up main apache logging, with:
+
+# * normal %v as hostname,
+# * vhost_common as logformat name,
+# * /var/log/piwik/main.log as the logfile,
+# * no env variable needed since we always want to trigger
+Use piwiklog %v vhost_common main " "
+<VirtualHost>
+	ServerName example.com
+	# Set this host to log to piwik with a different hostname (and using a different output file, /var/log/piwik/example_com.log)
+	Use piwiklog "another-host.com" vhost_common example_com " "
+</VirtualHost>
+
+<VirtualHost>
+	ServerName domain.com
+	# We want to log this normally, so repeat the CustomLog from the main section
+	# (if this is omitted, our other CustomLogs below will override the one in the main section, so the main site won't be logged)
+	Use piwiklog %v vhost_common main " "
+
+	# Now set up mod_rewrite to detect our subsites and set up new piwik websites to track just hits to these (this is a bit like profiles in Google Analytics).
+	# We want to match domain.com/anothersubsite and domain.com/subsite[0-9]+
+
+	# First to be on the safe side, unset the env we'll use to test if we're in a subsite:
+	UnsetEnv vhostLogName
+
+	# Subsite definitions. NB check for both URI and REFERER (some files used in a page, or downloads linked from a page, may not reside within our subsite directory):
+	# Do the one-off subsite first:
+	RewriteCond %{REQUEST_URI} ^/anothersubsite(/|$) [OR]
+	RewriteCond %{HTTP_REFERER} domain\.com/anothersubsite(/|$)
+	RewriteRule ^/.*        -       [E=vhostLogName:anothersubsite]
+	# Subsite of the form /subsite[0-9]+. NB the capture brackets in the RewriteCond rules which get mapped to %1 in the RewriteRule
+	RewriteCond %{REQUEST_URI} ^/(subsite[0-9]+)(/|$)) [OR]
+	RewriteCond %{HTTP_REFERER} domain\.com/(subsite[0-9]+)(/|$)
+	RewriteRule ^/.*        -       [E=vhostLogName:subsite%1]
+
+	# Now set the logging to piwik setting:
+	# * the hostname to domain.com/<subsitename>
+	# * the logformat to vhost_domain_com_subsites (can be anything so long as it's unique)
+	# * the output to go to /var/log/piwik/domain_com_subsites.log (again, can be anything)
+	# * triggering only when the env variable is set, so requests to other URIs on this domain don't call this logging rule
+	Use piwiklog domain.com/%{vhostLogName}e vhost_domain_com_subsites domain_com_subsites env=vhostLogName
+</VirtualHost>
+```
+
+## Nginx Virtual Host Log Format
+
+This log format can be specified for nginx access logs to capture multiple virtual hosts:
+
+* log_format vhosts '$host $remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent"';
+* access_log /PATH/TO/access.log vhosts;
+
+When executing import_logs.py specify the "common_complete" format.
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 0fa701eaa79..2f1a189ccba 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  * 
  * @category Piwik_Plugins
- * @package Piwik_Goals
+ * @package Piwik_MultiSites
  */
 
 /**
diff --git a/plugins/MultiSites/CalculateEvolutionFilter.php b/plugins/MultiSites/CalculateEvolutionFilter.php
index 55c6c8323d3..cbeffdfd047 100755
--- a/plugins/MultiSites/CalculateEvolutionFilter.php
+++ b/plugins/MultiSites/CalculateEvolutionFilter.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  * 
  * @category Piwik_Plugins
- * @package Piwik_Goals
+ * @package Piwik_MultiSites
  */
 
 /**