Assume if the ControllerName.php exists it matches /name/ routes.

src/application/ControllerArchive.php

@@ -14,7 +14,7 @@ class ControllerArchive extends Controller
      */
     public function records()
     {
-        $content_dir = Configuration::CONTENT_FOLDER  . '/posts';
+        $content_dir = Configuration::CONTENT_FOLDER  . '/post';
         $Files         = new Files($content_dir, $this->ext);
         $this->records = $Files->files();
     }

src/application/ControllerFeed.php

@@ -16,7 +16,7 @@ class ControllerFeed extends Controller
     public function records()
     {
         $limit         = Configuration::POSTS_HOMEPAGE;
-        $content_dir = Configuration::CONTENT_FOLDER . '/posts';
+        $content_dir = Configuration::CONTENT_FOLDER . '/post';
         $Records       = new Files($content_dir, $this->ext);
         $this->records = $Records->limit($limit + 5);
     }

src/application/ControllerHome.php

@@ -16,7 +16,7 @@ class ControllerHome extends Controller
     public function records()
     {
         $limit         = Configuration::POSTS_HOMEPAGE;
-        $content_dir = Configuration::CONTENT_FOLDER . '/posts';
+        $content_dir = Configuration::CONTENT_FOLDER . '/post';
         $Files         = new Files($content_dir, $this->ext);
         $this->records = $Files->limit($limit + 5);
     }

src/application/ControllerPage.php

@@ -4,7 +4,6 @@
 
 use Configuration;
 use Cuttlefish\Controller;
-use Cuttlefish\Filesystem;
 use Cuttlefish\Html;
 
 // single page
@@ -15,7 +14,7 @@ class ControllerPage extends Controller
      */
     public function records()
     {
-        $content_dir = Configuration::CONTENT_FOLDER . '/pages/';
+        $content_dir = Configuration::CONTENT_FOLDER . '/page/';
         $path = $content_dir . implode('/', $this->args) . '.' . $this->ext;
         $this->records = [ $path ];
     }
@@ -37,7 +36,7 @@ public function view()
 
         $this->View = new Html($this->Model->contents, array(
             'layout'     => 'layout.php',
-            'controller' => 'pages',
+            'controller' => 'page',
             'model'      => 'page',
         ));
     }

src/application/ControllerPost.php

@@ -15,7 +15,7 @@ class ControllerPost extends Controller
      */
     public function records()
     {
-        $content_dir = Configuration::CONTENT_FOLDER . '/posts/';
+        $content_dir = Configuration::CONTENT_FOLDER . '/post/';
         $path = $content_dir . implode('/', $this->args) . '.' . $this->ext;
         $this->records = [ $path ];
     }
@@ -37,7 +37,7 @@ public function view()
 
         $this->View = new Html($this->Model->contents, array(
             'layout'     => 'layout.php',
-            'controller' => 'posts',
+            'controller' => 'post',
             'model'      => 'post',
         ));
     }

src/index.php

@@ -8,5 +8,5 @@
 require '../vendor/autoload.php';
 require '../Configuration.php';
 
-$App = new Blog\App();
+$App = new Cuttlefish\App();
 $App->run();

src/system/App.php

@@ -26,15 +26,15 @@ public function __construct()
         $this->Security    = new Security();
     }
 
-    public function run(array $routes)
+    public function run()
     {
         if ($this->Cache->is_cached) {
             return;
         }
 
         // Process request if not statically cached.
         $this->Cache->start();
-        new Router($routes);
+        new Router();
         $this->Cache->end();
     }
 }

src/system/Cache.php

@@ -171,7 +171,7 @@ public function generateSite(): string
         $content = Configuration::CONTENT_FOLDER;
         $ext     = Configuration::CONTENT_EXT;
         $Curl    = new Curl();
-        $Files   = new Files($content, $ext );
+        $Files   = new Files($content, $ext);
 
         $cache_urls = array();
 
@@ -183,7 +183,7 @@ public function generateSite(): string
 
         $urls = array(
             '/',
-            '/feeds/posts',
+            '/feeds/post',
             '/archive',
         );
         foreach ($urls as $path) {
@@ -219,7 +219,7 @@ public function clear()
         global $App;
         $dir    = $this->getCacheFolder();
         $output = sprintf('Removing  all files in %s<br>', $dir);
-        $Files  = new Files($dir );
+        $Files  = new Files($dir);
         $output .= $Files->removeAll();
         $dirs   = Filesystem::subdirs(realpath($dir . '/.'), false);
         foreach ($dirs as $dir) {
@@ -251,7 +251,7 @@ protected function getCacheFolder()
     protected function copyThemeFiles($file_types)
     {
 
-        include_once( 'helpers.php' );
+        include_once('helpers.php');
         $output    = 'Copying files from theme: <br><br>';
 
         foreach ($file_types as $file_type) {

src/system/Controller.php

@@ -56,6 +56,6 @@ public function model()
      */
     public function view()
     {
-        include_once( 'helpers.php' );
+        include_once('helpers.php');
     }
 }

src/system/Defaults.php

@@ -4,7 +4,6 @@
 
 class Defaults
 {
-
     public const SITE_MOTTO = 'Something clever for the internets';
     public const SITE_TITLE = 'Your site';
     public const THEME = 'basic';

src/system/Environment.php

@@ -32,15 +32,11 @@ protected function isNewInstall(): bool
 
     protected function createSystemFolders(): void
     {
-        $cfg_content_folder = Configuration::CONTENT_FOLDER;
-
         $folders = array(
             Configuration::LOGS_FOLDER,
             Configuration::CACHE_FOLDER,
-            $cfg_content_folder . '/pages',
-            $cfg_content_folder . '/posts',
-            $cfg_content_folder . '/errors',
             Configuration::THEMES_FOLDER,
+            Configuration::CONTENT_FOLDER
         );
         $ok = null;
         foreach ($folders as $folder) {

src/system/Files.php

@@ -9,8 +9,8 @@ class Files
     public function __construct($dir_or_path, $ext = null)
     {
         if (empty($dir_or_path)) {
-        	$this->files = null;
-        	return;
+            $this->files = null;
+            return;
         }
 
         $files = $this->collect(realpath($dir_or_path), $ext);
@@ -37,7 +37,7 @@ protected function collect(string $dir = ".", $filter = null): array
         // get files
         if ($handle = opendir($dir)) {
             while (false !== ( $file = readdir($handle) )) {
-                if ( $file !== "." && $file !== "..") {
+                if ($file !== "." && $file !== "..") {
                     $file_path = $dir . DIRECTORY_SEPARATOR . $file;
                     if (is_dir($file_path)) {
                         $dir_files = $this->collect($file_path, $filter);

src/system/Model.php

@@ -118,9 +118,10 @@ public function section(string $content_section, $section_key): StdClass
     }
 
 
-    public function validate($Content) {
+    public function validate($Content)
+    {
         foreach ($this->required_fields as $section => $fields) {
-            if (!property_exists($Content,  $section)) {
+            if (!property_exists($Content, $section)) {
                 throw new Exception("Required section '$section' missing in content.");
             }
             foreach ($fields as $field) {

src/system/Router.php

@@ -15,14 +15,12 @@ class Router
 {
     protected $Controller;
 
-    public function __construct($routes)
+    public function __construct()
     {
-
         // Route to controller
         $args                 = explode("/", $this->pathInfo());
-        if (isset($routes[$args[1]])) {
-            $controller_class     =  $routes[$args[1]];
-        }
+        $controller_class     =  'Cuttlefish\Blog\Controller' . ucfirst($args[1]);
+
         $controller_arguments = array_slice($args, 2);
         if (class_exists($controller_class, true)) {
             $this->Controller = new $controller_class($this, $controller_arguments);
@@ -87,11 +85,12 @@ protected function redirect($Url, string $log_message): void
         exit($log_message);
     }
 
-    protected function matchRoute($pattern, $routes) {
-            $keys = array_flip($routes);    
-            $matches =  preg_grep($pattern,$keys);
-            if ($matches) {
-                return array_shift($matches);
-            }
+    protected function matchRoute($pattern, $routes)
+    {
+            $keys = array_flip($routes);
+            $matches =  preg_grep($pattern, $keys);
+        if ($matches) {
+            return array_shift($matches);
+        }
     }
 }

src/system/Template.php

@@ -22,7 +22,7 @@ public function __get($name)
 
     public function render(): void
     {
-        $path = BASE_FILEPATH . trim(theme_dir(),'/') . DIRECTORY_SEPARATOR . $this->file;
+        $path = BASE_FILEPATH . trim(theme_dir(), '/') . DIRECTORY_SEPARATOR . $this->file;
         require $path;
     }
 }

src/system/Url.php

@@ -63,7 +63,7 @@ public function convertFileToURL($file_object): self
             ], '', $url);
         }
 
-	    Log::debug(__FUNCTION__ . " relative_url: $relative_url");
+        Log::debug(__FUNCTION__ . " relative_url: $relative_url");
         $this->setUrl($relative_url);
 
         return $this;

src/system/helpers.php

@@ -15,9 +15,9 @@
  */
 function theme_dir($filename = '')
 {
-	$theme_folder = Configuration::THEMES_FOLDER . DIRECTORY_SEPARATOR . Configuration::THEME . DIRECTORY_SEPARATOR;
+    $theme_folder = Configuration::THEMES_FOLDER . DIRECTORY_SEPARATOR . Configuration::THEME . DIRECTORY_SEPARATOR;
 
-	return BASE_PATH . str_replace("\\", "/", $theme_folder) . $filename;
+    return BASE_PATH . str_replace("\\", "/", $theme_folder) . $filename;
 }
 
 // put functions specific to your application here. You can call these from the view templates.

src/themes/basic/errors.php

@@ -1,4 +1,4 @@
 <?php
 
 // Error pages use page layout
-include __DIR__ . DIRECTORY_SEPARATOR . "pages.php";
+include __DIR__ . DIRECTORY_SEPARATOR;

src/themes/basic/functions.php

@@ -28,14 +28,14 @@ function href($internal_url)
 function pages()
 {
     $output     = '';
-    $pages_path = Configuration::CONTENT_FOLDER .'/pages';
+    $pages_path = Configuration::CONTENT_FOLDER . '/page';
 
     $Files = new Cuttlefish\Files($pages_path, Configuration::CONTENT_EXT);
 
     foreach ($Files->files() as $path) {
         $filename = pathinfo($path, PATHINFO_FILENAME);
         $title    = ucwords(str_replace("-", " ", $filename));
-        $output   .= sprintf("<li><a href='%s'>%s</a></li>", href("/pages/$filename"), $title);
+        $output   .= sprintf("<li><a href='%s'>%s</a></li>", href("/page/$filename"), $title);
     }
 
     return $output;