matomo-org · mattab · Dec 17, 2014 · Dec 17, 2014 · Dec 17, 2014 · Dec 17, 2014
diff --git a/app/helpers/Content/Category/DevelopCategory.php b/app/helpers/Content/Category/DevelopCategory.php
@@ -31,27 +31,35 @@ public function getItems()
             ]),
             new EmptySubCategory('Understanding Piwik', [
                 new Guide('how-piwik-works'),
-                new Guide('all-about-analytics-data'),
+                new Guide('http-request-handling'),
                 new Guide('piwiks-extensibility-points'),
             ]),
-            new Guide('mvc-in-piwik'),
             new EmptySubCategory('Web Interface', [
+                new Guide('controllers'),
+                new Guide('views'),
                 new Guide('pages'),
                 new Guide('menus'),
                 new Guide('widgets'),
                 new Guide('working-with-piwiks-ui'),
                 new Guide('visualizing-report-data'),
             ]),
+            new EmptySubCategory('HTTP Reporting API', [
+                new Guide('apis'),
+                new Guide('piwiks-reporting-api'),
+            ]),
             new Guide('piwik-on-the-command-line'),
+            new EmptySubCategory('Archiving and data', [
+                new Guide('all-about-analytics-data'),
+                new Guide('persistence-and-the-mysql-backend'),
+                new Guide('plugin-data'),
+            ]),
             new Guide('piwik-configuration'),
-            new Guide('persistence-and-the-mysql-backend'),
             new EmptySubCategory('Security', [
                 new Guide('security-in-piwik'),
                 new Guide('permissions'),
             ]),
             new Guide('internationalization'),
             new Guide('tests'),
-            new Guide('piwiks-reporting-api'),
             new Guide('scheduled-tasks'),
             new EmptySubCategory('Piwik Core development', [
                 new Guide('contributing-to-piwik-core'),

diff --git a/app/helpers/Redirects.php b/app/helpers/Redirects.php
@@ -19,6 +19,10 @@ public static function getRedirects()
             '/api-reference/metadata'     => '/api-reference/reporting-api-metadata',
             '/api-reference/segmentation' => '/api-reference/reporting-api-segmentation',
             '/guides/automated-tests'     => '/guides/tests',
+            '/guides/mvc-in-piwik'        => '/guides/controllers',
+            '/guides/mvc-models'          => '/guides/apis',
+            '/guides/mvc-views'           => '/guides/views',
+            '/guides/mvc-controllers'     => '/guides/controllers',
         ];
     }
 }
diff --git a/docs/mvc-models.md → docs/apis.md b/docs/mvc-models.md → docs/apis.md
@@ -1,9 +1,7 @@
 ---
 category: Develop
-previous: http-request-handling
-next: mvc-views
 ---
-# Piwik APIs (Models)
+# Piwik APIs
 
 Piwik APIs serve two purposes: they serve the data used in controller methods and they [automatically expose plugin functionality through an HTTP API](/guides/piwiks-reporting-api).
 

diff --git a/docs/mvc-controllers.md → docs/controllers.md b/docs/mvc-controllers.md → docs/controllers.md
@@ -1,6 +1,5 @@
 ---
 category: Develop
-previous: mvc-views
 ---
 # Controllers
 

diff --git a/docs/http-request-handling.md b/docs/http-request-handling.md
@@ -1,12 +1,8 @@
 ---
 category: Develop
-previous: mvc-in-piwik
-next: mvc-models
 ---
 # How Piwik Handles HTTP Requests
 
-Piwik's MVC (Model-View-Controller) implementation is the first bit of code that is executed when Piwik handles an HTTP request.
-
 Every request that is sent to Piwik's reporting side (as opposed to Piwik's tracking side) is sent to the `index.php` file in Piwik's root directory. This file creates an instance of the [FrontController](/api-reference/Piwik/FrontController) and uses it to dispatch the current request.
 
 The FrontController looks for the `module` and `action` query parameters. If `action` is missing, it takes the default value `"index"`. Piwik then invokes the matching controller method:

diff --git a/docs/mvc-in-piwik.md b/docs/mvc-in-piwik.md
diff --git a/docs/pages.md b/docs/pages.md
@@ -7,7 +7,7 @@ A page can contain any corporate related content, key metrics, news, help pages,
 
 ## Creating a page
 
-Creating a page means creating [a controller](/guides/mvc-controllers) and [a Twig template](/guides/mvc-views).
+Creating a page means creating [a controller](/guides/controllers) and [a Twig template](/guides/views).
 
 You can use the console for this:
 
@@ -87,5 +87,6 @@ So far you have created a page but you can still not access it. To add it to one
 
 You can also read the following guides:
 
-- [Controllers](/guides/mvc-controllers.md)
+- [Controllers](/guides/controllers.md)
+- [Controllers](/guides/views.md)
 - [Security in Piwik](/guides/security-in-piwik.md)