From eee3c1f96ea7bdfa6e81d8969b5766202d8e6883 Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Tue, 4 Aug 2015 16:45:24 -0400
Subject: [PATCH] Namespace autoloading,and unify under 'Meta' namespace

---
 {sys/core => Meta/Base}/Controller.php        |  55 ++--------
 {sys/core => Meta/Base}/Model.php             |  15 +--
 {sys/core => Meta/Base}/Page.php              |  15 +--
 {sys => Meta/Base}/common.php                 | 103 +++---------------
 {sys/core => Meta/Base}/db.php                |  16 ++-
 .../Controller/Category.php                   |  14 +--
 .../genre.php => Meta/Controller/Genre.php    |   4 +-
 .../Controller/Section.php                    |  12 +-
 .../data_model.php => Meta/Model/Data.php     |  15 +--
 {app => Meta}/config/config.php               |   4 +-
 {app => Meta}/config/routes.php               |   0
 {app => Meta}/views/category_detail.php       |   6 +-
 {app => Meta}/views/edit_form.php             |   0
 {app => Meta}/views/errors/error_404.php      |   0
 {app => Meta}/views/errors/error_db.php       |   0
 {app => Meta}/views/errors/error_general.php  |   0
 .../views/errors/error_php_exception.php      |   0
 {app => Meta}/views/footer.php                |   0
 {app => Meta}/views/genre_detail.php          |   6 +-
 {app => Meta}/views/genres.php                |   4 +-
 {app => Meta}/views/header.php                |   0
 {app => Meta}/views/message.php               |   0
 {app => Meta}/views/outline.php               |   6 +-
 {app => Meta}/views/section_detail.php        |  10 +-
 {app => Meta}/views/theme_footer.php          |   0
 Meta/views/theme_header.php                   |   6 +
 app/config/db.php                             |  37 -------
 app/views/theme_header.php                    |   6 -
 assets/js/meta.js                             |   1 +
 composer.json                                 |   3 +-
 index.php                                     |  41 ++++---
 phpdoc.dist.xml                               |  12 +-
 32 files changed, 116 insertions(+), 275 deletions(-)
 rename {sys/core => Meta/Base}/Controller.php (58%)
 mode change 100755 => 100644
 rename {sys/core => Meta/Base}/Model.php (69%)
 mode change 100755 => 100644
 rename {sys/core => Meta/Base}/Page.php (98%)
 mode change 100755 => 100644
 rename {sys => Meta/Base}/common.php (75%)
 rename {sys/core => Meta/Base}/db.php (88%)
 rename app/controllers/category.php => Meta/Controller/Category.php (90%)
 mode change 100755 => 100644
 rename app/controllers/genre.php => Meta/Controller/Genre.php (98%)
 mode change 100755 => 100644
 rename app/controllers/section.php => Meta/Controller/Section.php (91%)
 mode change 100755 => 100644
 rename app/models/data_model.php => Meta/Model/Data.php (98%)
 mode change 100755 => 100644
 rename {app => Meta}/config/config.php (97%)
 mode change 100755 => 100644
 rename {app => Meta}/config/routes.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/category_detail.php (78%)
 mode change 100755 => 100644
 rename {app => Meta}/views/edit_form.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/errors/error_404.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/errors/error_db.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/errors/error_general.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/errors/error_php_exception.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/footer.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/genre_detail.php (76%)
 mode change 100755 => 100644
 rename {app => Meta}/views/genres.php (83%)
 mode change 100755 => 100644
 rename {app => Meta}/views/header.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/message.php (100%)
 mode change 100755 => 100644
 rename {app => Meta}/views/outline.php (79%)
 mode change 100755 => 100644
 rename {app => Meta}/views/section_detail.php (70%)
 mode change 100755 => 100644
 rename {app => Meta}/views/theme_footer.php (100%)
 mode change 100755 => 100644
 create mode 100644 Meta/views/theme_header.php
 delete mode 100644 app/config/db.php
 delete mode 100755 app/views/theme_header.php

diff --git a/sys/core/Controller.php b/Meta/Base/Controller.php
old mode 100755
new mode 100644
similarity index 58%
rename from sys/core/Controller.php
rename to Meta/Base/Controller.php
index 16e5874..9159eea
--- a/sys/core/Controller.php
+++ b/Meta/Base/Controller.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * MiniMVC
+ * meta
  *
- * Convention-based micro-framework for PHP
+ * Hierarchial data tool
  *
- * @package		miniMVC
+ * @package		meta
  * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2011 - 2012
- * @link 		https://github.com/aviat4ion/miniMVC
+ * @copyright	Copyright (c) 2012 - 2015
+ * @link 		https://github.com/aviat4ion/meta
  * @license 	http://philsturgeon.co.uk/code/dbad-license
  */
 
 // --------------------------------------------------------------------------
 
-namespace miniMVC;
+namespace Meta\Base;
+use Meta\Model\Data as Data_Model;
 
 /**
  * Base Controller Class
- *
- * @package miniMVC
- * @subpackage System
  */
 class Controller {
 
@@ -43,47 +41,16 @@ class Controller {
 			$this->page = new Page();
 		}
 
-		$this->load_model('meta\data_model');
-		$db = \miniMVC\db::get_instance();
+
+		$this->data_model = new Data_Model();
+
+		$db = \Meta\Base\db::get_instance();
 
 		$this->page->queries =& $db->queries;
 	}
 
 	// --------------------------------------------------------------------------
 
-	/**
-	 * Function for loading a model into the current class
-	 *
-	 * @param string $file
-	 * @param array $args
-	 * @return void
-	 */
-	public function load_model($file, $args=array())
-	{
-		$segments = explode('\\', $file);
-		$file_name = end($segments);
-
-		// The module is set via the router
-		$path = MM_APP_PATH . "models/{$file_name}.php";
-
-		if (is_file($path))
-		{
-			require_once($path);
-		}
-
-		if ( ! empty($args))
-		{
-
-			$this->$file_name = new $file($args);
-		}
-		else
-		{
-			$this->$file_name = new $file;
-		}
-	}
-
-	// --------------------------------------------------------------------------
-
 	/**
 	 * Function for loading a view
 	 *
diff --git a/sys/core/Model.php b/Meta/Base/Model.php
old mode 100755
new mode 100644
similarity index 69%
rename from sys/core/Model.php
rename to Meta/Base/Model.php
index d3778ee..08e629e
--- a/sys/core/Model.php
+++ b/Meta/Base/Model.php
@@ -1,25 +1,22 @@
 <?php
 /**
- * MiniMVC
+ * meta
  *
- * Convention-based micro-framework for PHP
+ * Hierarchial data tool
  *
- * @package		miniMVC
+ * @package		meta
  * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2011 - 2012
- * @link 		https://github.com/aviat4ion/miniMVC
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/meta
  * @license 	http://philsturgeon.co.uk/code/dbad-license
  */
 
 // --------------------------------------------------------------------------
 
-namespace miniMVC;
+namespace Meta\Base;
 
 /**
  * Base Model Class
- *
- * @package miniMVC
- * @subpackage System
  */
 class Model extends \ArrayObject {
 
diff --git a/sys/core/Page.php b/Meta/Base/Page.php
old mode 100755
new mode 100644
similarity index 98%
rename from sys/core/Page.php
rename to Meta/Base/Page.php
index b31d805..35c603e
--- a/sys/core/Page.php
+++ b/Meta/Base/Page.php
@@ -1,28 +1,25 @@
 <?php
 /**
- * MiniMVC
+ * meta
  *
- * Convention-based micro-framework for PHP
+ * Hierarchial data tool
  *
- * @package		miniMVC
+ * @package		meta
  * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2011 - 2012
- * @link 		https://github.com/aviat4ion/miniMVC
+ * @copyright	Copyright (c) 2012 - 2015
+ * @link 		https://github.com/aviat4ion/meta
  * @license 	http://philsturgeon.co.uk/code/dbad-license
  */
 
 // --------------------------------------------------------------------------
 
-namespace miniMVC;
+namespace Meta\Base;
 
 /**
  * Class for building pages
  *
  * All methods are chainable, with the exception of the constructor,
  * build_header(), build_footer(), and _headers() methods.
- *
- * @package miniMVC
- * @subpackage System
  */
 class Page {
 
diff --git a/sys/common.php b/Meta/Base/common.php
similarity index 75%
rename from sys/common.php
rename to Meta/Base/common.php
index 5d5f340..0002cf8 100755
--- a/sys/common.php
+++ b/Meta/Base/common.php
@@ -1,65 +1,22 @@
 <?php
 /**
- * MiniMVC
+ * meta
  *
- * Convention-based micro-framework for PHP
+ * Simple hierarchial data management
  *
- * @package		miniMVC
+ * @package		meta
  * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2011 - 2012
- * @link 		https://github.com/aviat4ion/miniMVC
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/meta
  * @license 	http://philsturgeon.co.uk/code/dbad-license
  */
 
 // --------------------------------------------------------------------------
 
-/**
- * File including common framework-wide functions
- *
- * @package miniMVC
- * @subpackage System
- */
+namespace Meta\Base;
 
-namespace miniMVC;
 use \Aura\Router\RouterFactory;
 
-// --------------------------------------------------------------------------
-// ! Autoloading
-// --------------------------------------------------------------------------
-
-/**
- * Function to autoload system libraries
- *
- * @param string
- */
-function autoload($name)
-{
-	if ($name == '') return;
-
-	// strip off namespaces - they all go to the same folder
-	$names = explode('\\', trim($name));
-	$name = end($names);
-
-	// Paths to load from
-	$sys_path = MM_SYS_PATH . "core/{$name}.php";
-	$lib_path =  MM_SYS_PATH . "libraries/{$name}.php";
-	$class_path = MM_APP_PATH . "classes/{$name}.php";
-
-	if (is_file($sys_path))
-	{
-		require_once($sys_path);
-	}
-	elseif (is_file($lib_path))
-	{
-		require_once($lib_path);
-	}
-
-	if (is_file($class_path))
-	{
-		require_once($class_path);
-	}
-}
-
 // --------------------------------------------------------------------------
 // ! Messages
 // --------------------------------------------------------------------------
@@ -144,7 +101,7 @@ function controller_methods($controller)
 	$methods = \get_class_methods($controller);
 
 	// Eliminate methods from Controller and Model classes
-	$skip_methods = array_merge(\get_class_methods('miniMVC\Controller'), \get_class_methods('miniMVC\Model'));
+	$skip_methods = array_merge(\get_class_methods('\Meta\Base\Controller'), \get_class_methods('\Meta\Base\Model'));
 	$methods = array_diff($methods, $skip_methods);
 
 	return $methods;
@@ -218,19 +175,6 @@ if ( ! function_exists('do_include'))
 // ! Bootstrap functions
 // --------------------------------------------------------------------------
 
-/**
- * Load required classes for bootstraping
- *
- * @return void
- */
-function init()
-{
-	// Map to the appropriate module/controller/function
-	route();
-}
-
-// --------------------------------------------------------------------------
-
 /**
  * Returns the last segment of the current url
  *
@@ -338,32 +282,21 @@ function route()
  */
 function run($controller, $func, $args = array())
 {
-	$path = MM_APP_PATH . "controllers/{$controller}.php";
+	$controller_class = ucfirst($controller);
+	$controller = "Meta\\Controller\\{$controller_class}";
 
-	if (is_file($path))
+	// Get the list of valid methods for that controller
+	$methods = controller_methods($controller);
+
+	if (in_array($func, $methods))
 	{
-		require_once($path);
-
-		// Get the list of valid methods for that controller
-		$methods = controller_methods($controller);
-
-		if (in_array($func, $methods))
+		if (class_exists($controller))
 		{
-
-			// Define the name of the current module for file loading
-			if ( ! defined('MM_MOD'))
-			{
-				define('MM_MOD', 'meta');
-			}
-
-			if (class_exists($controller))
-			{
-				$class = new $controller();
-			}
-
-			call_user_func_array(array($class, $func), $args);
-			return;
+			$class = new $controller();
 		}
+
+		call_user_func_array(array($class, $func), $args);
+		return;
 	}
 
 	// Function doesn't exist...404
diff --git a/sys/core/db.php b/Meta/Base/db.php
similarity index 88%
rename from sys/core/db.php
rename to Meta/Base/db.php
index aeff8e9..fcea507 100755
--- a/sys/core/db.php
+++ b/Meta/Base/db.php
@@ -1,25 +1,23 @@
 <?php
 /**
- * MiniMVC
+ * meta
  *
- * Convention-based micro-framework for PHP
+ * Simple hierarchial data management
  *
- * @package		miniMVC
+ * @package		meta
  * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2011 - 2012
- * @link 		https://github.com/aviat4ion/miniMVC
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/meta
  * @license 	http://philsturgeon.co.uk/code/dbad-license
  */
 
 // --------------------------------------------------------------------------
 
-namespace miniMVC;
+namespace Meta\Base;
 
 /**
  * Extend PHP's PDO class to add some more functionality
  *
- * @package miniMVC
- * @subpackage System
  */
 class db extends \Query\Query_Builder {
 
@@ -81,7 +79,7 @@ class db extends \Query\Query_Builder {
 		{
 			$error = $this->errorInfo();
 		}
-		
+
 		list($code, $driver_code, $message) = $error;
 
 		// Contain the content for buffering
diff --git a/app/controllers/category.php b/Meta/Controller/Category.php
old mode 100755
new mode 100644
similarity index 90%
rename from app/controllers/category.php
rename to Meta/Controller/Category.php
index 64fdea1..ef79831
--- a/app/controllers/category.php
+++ b/Meta/Controller/Category.php
@@ -13,20 +13,14 @@
 
 // --------------------------------------------------------------------------
 
+namespace Meta\Controller;
+
 /**
  * Category controller
  *
  * @package meta
  */
-class category extends \miniMVC\Controller {
-
-	/**
-	 * Initialize the Controller
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
+class Category extends \Meta\Base\Controller {
 
 	/**
 	 * Returns the sections / editing options for a category
@@ -79,4 +73,4 @@ class category extends \miniMVC\Controller {
 	}
 }
 
-// End of genre.php
\ No newline at end of file
+// End of category.php
\ No newline at end of file
diff --git a/app/controllers/genre.php b/Meta/Controller/Genre.php
old mode 100755
new mode 100644
similarity index 98%
rename from app/controllers/genre.php
rename to Meta/Controller/Genre.php
index 776d4a0..ef06591
--- a/app/controllers/genre.php
+++ b/Meta/Controller/Genre.php
@@ -13,12 +13,14 @@
 
 // --------------------------------------------------------------------------
 
+namespace Meta\Controller;
+
 /**
  * Genre controller
  *
  * @package meta
  */
-class genre extends \miniMVC\Controller {
+class Genre extends \Meta\Base\Controller {
 
 	/**
 	 * Default controller method
diff --git a/app/controllers/section.php b/Meta/Controller/Section.php
old mode 100755
new mode 100644
similarity index 91%
rename from app/controllers/section.php
rename to Meta/Controller/Section.php
index 1b6d1c1..b38fb47
--- a/app/controllers/section.php
+++ b/Meta/Controller/Section.php
@@ -13,20 +13,14 @@
 
 // --------------------------------------------------------------------------
 
+namespace Meta\Controller;
+
 /**
  * Section Controller
  *
  * @package meta
  */
-class section extends \miniMVC\Controller {
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-	}
+class Section extends \Meta\Base\Controller {
 
 	/**
 	 * Default controller method
diff --git a/app/models/data_model.php b/Meta/Model/Data.php
old mode 100755
new mode 100644
similarity index 98%
rename from app/models/data_model.php
rename to Meta/Model/Data.php
index 8f64e2e..b5af021
--- a/app/models/data_model.php
+++ b/Meta/Model/Data.php
@@ -13,16 +13,13 @@
 
 // --------------------------------------------------------------------------
 
-namespace meta;
-
-use \miniMVC\db;
+namespace Meta\Model;
+use \Meta\Base\db;
 
 /**
- * Main Model for database interaction
- *
- * @package meta
+ * Main Model for DB interaction
  */
-class data_model extends \miniMVC\Model {
+class Data extends \Meta\Base\Model {
 
 	/**
 	 * Reference to database connection
@@ -695,7 +692,5 @@ class data_model extends \miniMVC\Model {
 
 		}
 	}
-
 }
-
-// End of data_model.php
\ No newline at end of file
+// End of data.php
\ No newline at end of file
diff --git a/app/config/config.php b/Meta/config/config.php
old mode 100755
new mode 100644
similarity index 97%
rename from app/config/config.php
rename to Meta/config/config.php
index 5cafe37..2133064
--- a/app/config/config.php
+++ b/Meta/config/config.php
@@ -42,7 +42,7 @@ define('BASE_URL', '//' . $_SERVER['HTTP_HOST'] . '/');
 | slash.
 |
 */
-define('BASE_PATH', 'meta/');
+define('BASE_PATH', '');
 
 /*
 |--------------------------------------------------------------------------
@@ -52,7 +52,7 @@ define('BASE_PATH', 'meta/');
 | This determines whether "index.php" is in generated urls
 |
 */
-define('URL_INDEX_FILE',  BASE_PATH . 'index.php/');
+define('URL_INDEX_FILE',  BASE_PATH . '');
 
 /*
 |--------------------------------------------------------------------------
diff --git a/app/config/routes.php b/Meta/config/routes.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/config/routes.php
rename to Meta/config/routes.php
diff --git a/app/views/category_detail.php b/Meta/views/category_detail.php
old mode 100755
new mode 100644
similarity index 78%
rename from app/views/category_detail.php
rename to Meta/views/category_detail.php
index f3f8118..24c5a6d
--- a/app/views/category_detail.php
+++ b/Meta/views/category_detail.php
@@ -1,8 +1,8 @@
 <p class="breadcrumbs">
-<a href="<?= miniMVC\site_url('') ?>">Genres</a> > <a href="<?= miniMVC\site_url('genre/detail/'.$genre['id']) ?>"><?= $genre['genre'] ?></a> > <?= $category ?>
+<a href="<?= \Meta\Base\site_url('') ?>">Genres</a> > <a href="<?= \Meta\Base\site_url('genre/detail/'.$genre['id']) ?>"><?= $genre['genre'] ?></a> > <?= $category ?>
 </p>
 
-<form class="add" action="<?= miniMVC\site_url("category/add_section") ?>" method="post">
+<form class="add" action="<?= \Meta\Base\site_url("category/add_section") ?>" method="post">
 	<fieldset>
 		<legend>Add Section</legend>
 		<dl>
@@ -21,7 +21,7 @@
 <?php foreach($sections as $id => $section): ?>
 	<?php if (is_array($section)) list($section, $d) = $section ?>
 	<li>
-		<h4><a href="<?= miniMVC\site_url("section/detail/{$id}") ?>"><?= $section ?></a></h4>
+		<h4><a href="<?= \Meta\Base\site_url("section/detail/{$id}") ?>"><?= $section ?></a></h4>
 		<span class="modify" data-id="<?= $id ?>" data-type="section" data-parent="<?= $category_id ?>">
 			<button class="edit">Edit Section</button>
 			<button class="delete">Delete Section</button>
diff --git a/app/views/edit_form.php b/Meta/views/edit_form.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/edit_form.php
rename to Meta/views/edit_form.php
diff --git a/app/views/errors/error_404.php b/Meta/views/errors/error_404.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/errors/error_404.php
rename to Meta/views/errors/error_404.php
diff --git a/app/views/errors/error_db.php b/Meta/views/errors/error_db.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/errors/error_db.php
rename to Meta/views/errors/error_db.php
diff --git a/app/views/errors/error_general.php b/Meta/views/errors/error_general.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/errors/error_general.php
rename to Meta/views/errors/error_general.php
diff --git a/app/views/errors/error_php_exception.php b/Meta/views/errors/error_php_exception.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/errors/error_php_exception.php
rename to Meta/views/errors/error_php_exception.php
diff --git a/app/views/footer.php b/Meta/views/footer.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/footer.php
rename to Meta/views/footer.php
diff --git a/app/views/genre_detail.php b/Meta/views/genre_detail.php
old mode 100755
new mode 100644
similarity index 76%
rename from app/views/genre_detail.php
rename to Meta/views/genre_detail.php
index 5f1eff8..a1f1b69
--- a/app/views/genre_detail.php
+++ b/Meta/views/genre_detail.php
@@ -1,8 +1,8 @@
 <p class="breadcrumbs">
-<a href="<?= miniMVC\site_url('') ?>">Genres</a> > <?= $genre ?>
+<a href="<?= \Meta\Base\site_url('') ?>">Genres</a> > <?= $genre ?>
 </p>
 
-<form class="add" action="<?= miniMVC\site_url("genre/add_category") ?>" method="post">
+<form class="add" action="<?= \Meta\Base\site_url("genre/add_category") ?>" method="post">
 	<fieldset>
 		<legend>Add Category</legend>
 		<dl>
@@ -19,7 +19,7 @@
 <ul class="list">
 <?php foreach($categories as $id => $cat): ?>
 	<li>
-		<a href="<?= miniMVC\site_url("category/detail/{$id}") ?>"><?= $cat ?></a>
+		<a href="<?= \Meta\Base\site_url("category/detail/{$id}") ?>"><?= $cat ?></a>
 		<span class="modify" data-type="category" data-id="<?=$id ?>" data-parent="<?=$genre_id ?>">
 			<button class="edit">Edit Category</button>
 			<button class="delete">Delete Category</button>
diff --git a/app/views/genres.php b/Meta/views/genres.php
old mode 100755
new mode 100644
similarity index 83%
rename from app/views/genres.php
rename to Meta/views/genres.php
index c0a93ce..a6c00e6
--- a/app/views/genres.php
+++ b/Meta/views/genres.php
@@ -1,6 +1,6 @@
 <p class="breadcrumbs">Genres</p>
 
-<form class="add" action="<?= miniMVC\site_url("genre/add") ?>" method="post">
+<form class="add" action="<?= Meta\Base\site_url("genre/add") ?>" method="post">
 	<fieldset>
 		<legend>Add Genre</legend>
 		<dl>
@@ -18,7 +18,7 @@
 <ul class="list">
 <?php foreach($genres as $id => $name): ?>
 	<li>
-		<a href="<?= miniMVC\site_url("genre/detail/{$id}") ?>">
+		<a href="<?= Meta\Base\site_url("genre/detail/{$id}") ?>">
 			<?= $name ?>
 		</a>
 		<span class="modify" data-id="<?= $id ?>" data-type="genre" data-parent="<?=$id ?>">
diff --git a/app/views/header.php b/Meta/views/header.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/header.php
rename to Meta/views/header.php
diff --git a/app/views/message.php b/Meta/views/message.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/message.php
rename to Meta/views/message.php
diff --git a/app/views/outline.php b/Meta/views/outline.php
old mode 100755
new mode 100644
similarity index 79%
rename from app/views/outline.php
rename to Meta/views/outline.php
index 058d233..946890e
--- a/app/views/outline.php
+++ b/Meta/views/outline.php
@@ -20,7 +20,7 @@
 	<!-- Genres -->
 	<?php foreach($genre_array as $genre => $cat_array): ?>
 	<dt>
-		<a href="<?= \miniMVC\site_url("genre/detail/{$genre_id}") ?>"><?= $genre ?></a>
+		<a href="<?= \Meta\Base\site_url("genre/detail/{$genre_id}") ?>"><?= $genre ?></a>
 	</dt>
 	<dd>
 
@@ -29,14 +29,14 @@
 			<!-- Categories -->
 			<?php foreach($cname_array as $category => $sect_array): ?>
 			<li>
-				<a href="<?= \miniMVC\site_url("category/detail/{$cat_id}") ?>"><?= $category ?></a>
+				<a href="<?= \Meta\Base\site_url("category/detail/{$cat_id}") ?>"><?= $category ?></a>
 
 				<?php if ( ! empty($sect_array)): ?>
 				<ul>
 					<!-- Sections -->
 					<?php foreach($sect_array as $section_id => $section): ?>
 					<li>
-						<a href="<?= \miniMVC\site_url("section/detail/{$section_id}") ?>">
+						<a href="<?= \Meta\Base\site_url("section/detail/{$section_id}") ?>">
 							<?= $section ?>
 						</a>
 					</li>
diff --git a/app/views/section_detail.php b/Meta/views/section_detail.php
old mode 100755
new mode 100644
similarity index 70%
rename from app/views/section_detail.php
rename to Meta/views/section_detail.php
index 727113e..d487f5a
--- a/app/views/section_detail.php
+++ b/Meta/views/section_detail.php
@@ -1,10 +1,10 @@
 <p class="breadcrumbs">
-	<a href="<?= miniMVC\site_url('') ?>">Genres</a> >
-	<a href="<?= miniMVC\site_url('genres/detail/'.$p['genre_id']) ?>"><?= $p['genre'] ?></a> >
-	<a href="<?= miniMVC\site_url('category/detail/'.$p['category_id']) ?>"><?= $p['category'] ?></a> >
+	<a href="<?= \Meta\Base\site_url('') ?>">Genres</a> >
+	<a href="<?= \Meta\Base\site_url('genres/detail/'.$p['genre_id']) ?>"><?= $p['genre'] ?></a> >
+	<a href="<?= \Meta\Base\site_url('category/detail/'.$p['category_id']) ?>"><?= $p['category'] ?></a> >
 	<?= $section ?>
 </p>
-<form class="add" action="<?= miniMVC\site_url("section/add_data") ?>" method="post" onsubmit="window.edit_wysiwyg.toggle()">
+<form class="add" action="<?= \Meta\Base\site_url("section/add_data") ?>" method="post" onsubmit="window.edit_wysiwyg.toggle()">
 	<fieldset>
 		<legend>Add Data</legend>
 		<dl>
@@ -13,7 +13,7 @@
 				<input type="text" name="name[]" id="section" /></dd>
 
 			<dt><label for="val">Value:</label></dt><dd>
-				<textarea id="val" name="val[]" rows="5" cols="40"></textarea></dd>
+				<textarea id="val2" name="val[]" rows="5" cols="40"></textarea></dd>
 
 			<dt><input type="hidden" name="section_id" value="<?= $section_id ?>" /></dt><dd>
 				<button type="submit" class="save">Save Data</button></dd>
diff --git a/app/views/theme_footer.php b/Meta/views/theme_footer.php
old mode 100755
new mode 100644
similarity index 100%
rename from app/views/theme_footer.php
rename to Meta/views/theme_footer.php
diff --git a/Meta/views/theme_header.php b/Meta/views/theme_header.php
new file mode 100644
index 0000000..ff9484b
--- /dev/null
+++ b/Meta/views/theme_header.php
@@ -0,0 +1,6 @@
+<script type="text/javascript">
+	var APP_URL = '<?= \Meta\Base\site_url(''); ?>';
+	var ASSET_URL = APP_URL.replace('index.php/', '') + '/assets/';
+</script>
+<h1><a href="<?= \Meta\Base\site_url('') ?>">Meta</a></h1>
+<span id="outline">[<a href="<?= \Meta\Base\site_url('outline')?>">Data Outline</a>]</span>
\ No newline at end of file
diff --git a/app/config/db.php b/app/config/db.php
deleted file mode 100644
index dfe2466..0000000
--- a/app/config/db.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * MiniMVC
- *
- * Convention-based micro-framework for PHP
- *
- * @package		miniMVC
- * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2011 - 2012
- * @link 		https://github.com/aviat4ion/miniMVC
- * @license 	http://philsturgeon.co.uk/code/dbad-license
- */
-
-// --------------------------------------------------------------------------
-
-/**
- * Database config file
- *
- * @package miniMVC
- * @subpackage App
- */
-
-// --------------------------------------------------------------------------
-
-$db_conf = array(
-	'default' => array(
-		'type' => 'sqlite',
-		'host' => '',
-		'user' => '',
-		'pass' => '',
-		'port' => '',
-		'database'   => '',
-		'file' => MM_SYS_PATH . 'meta.sqlite',
-	)
-);
-
-// End of db.php
\ No newline at end of file
diff --git a/app/views/theme_header.php b/app/views/theme_header.php
deleted file mode 100755
index 15d1d37..0000000
--- a/app/views/theme_header.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<script type="text/javascript">
-	var APP_URL = '<?= \miniMVC\site_url(''); ?>';
-	var ASSET_URL = APP_URL.replace('index.php/', '') + '/assets/';
-</script>
-<h1><a href="<?= miniMVC\site_url('') ?>">Meta</a></h1>
-<span id="outline">[<a href="<?= miniMVC\site_url('outline')?>">Data Outline</a>]</span>
\ No newline at end of file
diff --git a/assets/js/meta.js b/assets/js/meta.js
index 11df711..e796b5e 100755
--- a/assets/js/meta.js
+++ b/assets/js/meta.js
@@ -226,5 +226,6 @@ $_.ext('center', function (sel){
 	if (document.getElementsByTagName('textarea').length > 0)
 	{
 		meta.initTINY('val');
+		meta.initTINY('val2');
 	}
 }(window, $_));
\ No newline at end of file
diff --git a/composer.json b/composer.json
index b17cee6..031590a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
     "require": {
 	    "filp/whoops": "1.1.*",
         "aura/router": "2.2.*",
-        "aviat4ion/query": "2.0.*"
+		"aura/web": "2.0.*",
+		"aviat4ion/query": "*"
     }
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index 0ca900d..9e89171 100755
--- a/index.php
+++ b/index.php
@@ -1,28 +1,22 @@
 <?php
 /**
- * MiniMVC
+ * meta
  *
- * Convention-based micro-framework for PHP
+ * Simple hierarchial data management
  *
- * @package		miniMVC
+ * @package		meta
  * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2011 - 2012
- * @link 		https://github.com/aviat4ion/miniMVC
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/meta
  * @license 	http://philsturgeon.co.uk/code/dbad-license
  */
 
 // --------------------------------------------------------------------------
 
-/**
- * miniMVC bootstrap file
- *
- * @package miniMVC
- * @subpackage App
- */
+namespace Meta\Base;
 
 // --------------------------------------------------------------------------
 
-namespace miniMVC;
 
 use \Whoops\Handler\PrettyPageHandler;
 use \Whoops\Handler\JsonResponseHandler;
@@ -31,8 +25,8 @@ error_reporting(-1);
 
 // Set the default paths
 define('MM_BASE_PATH', __DIR__);
-define('MM_SYS_PATH', __DIR__.'/sys/');
-define('MM_APP_PATH', __DIR__.'/app/');
+define('MM_SYS_PATH', __DIR__.'/Meta/Base/');
+define('MM_APP_PATH', __DIR__.'/Meta/');
 
 // Autoload vendors
 require(MM_BASE_PATH . '/vendor/autoload.php');
@@ -46,13 +40,24 @@ $whoops->register();
 // Require the basic configuration file
 require(MM_APP_PATH . 'config/config.php');
 
+// Start the autoloader
+spl_autoload_register(function($name) {
+	if ($name == '') return;
+
+	// load by namespace
+	$names = explode('\\', trim($name));
+	$ns_path = MM_BASE_PATH . '/' .  implode('/', $names) . '.php';
+
+	if (is_file($ns_path))
+	{
+		require_once($ns_path);
+	}
+});
+
 // Require the most important files
 require(MM_SYS_PATH . 'common.php');
 
-// Start the autoloader
-spl_autoload_register('miniMVC\autoload');
-
 // And away we go!
-init();
+route();
 
 // End of index.php
\ No newline at end of file
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 6982c7a..0fff894 100755
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -11,14 +11,8 @@
         <template name="responsive" />
     </transformations>
 	<files>
-		<directory>.</directory>
-		<directory>app/modules/</directory>
-		<ignore>tests/*</ignore>
-		<ignore>assets/*</ignore>
-		<ignore>vendor/*</ignore>
-		<ignore>sys/db/*</ignore>
-		<ignore>app/config/*</ignore>
-		<ignore>app/views/*</ignore>
-		<ignore>*/views/*</ignore>
+		<directory>Meta/*</directory>
+		<ignore>Meta/views/*</ignore>
+		<ignore>Meta/config/*</ignore>
 	</files>
 </phpdoc>
\ No newline at end of file