diff --git a/_sakura/components/configuration.php b/_sakura/components/configuration.php
deleted file mode 100644
index e69de29..0000000
diff --git a/_sakura/components/hashing.php b/_sakura/components/hashing.php
deleted file mode 100644
index 37cce25..0000000
--- a/_sakura/components/hashing.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/*
- * Flashii PBKDF2 Password Hashing
- *
- * Based on Password Hashing With PBKDF2 (https://defuse.ca/php-pbkdf2.htm).
- * Copyright (c) 2013, Taylor Hornby
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace Flashii;
-
-class Hashing {
-    
-    // These variables can be changed without break the existing hashes
-    private static $_PBKDF2_HASH_ALGORITHM  = 'sha256';
-    private static $_PBKDF2_ITERATIONS      = 1000;
-    private static $_PBKDF2_SALT_BYTES      = 24;
-    private static $_PBKDF2_HASH_BYTES      = 24;
-    
-    // Changing these will break it though
-    private static $_HASH_ALGORITHM_INDEX   = 0;
-    private static $_HASH_ITERATION_INDEX   = 1;
-    private static $_HASH_SALT_INDEX        = 2;
-    private static $_HASH_PBKDF2_INDEX      = 3;
-    private static $_HASH_SECTIONS          = 4;
-
-    // Returns an array formatted like: [algorithm, iterations, salt, hash]
-    public static function create_hash($pass) {
-        $salt = base64_encode(
-            \mcrypt_create_iv(
-                self::$_PBKDF2_SALT_BYTES,
-                MCRYPT_DEV_URANDOM
-            )
-        );
-        
-        $hash = base64_encode(
-            self::pbkdf2(
-                self::$_PBKDF2_HASH_ALGORITHM,
-                $pass,
-                $salt,
-                self::$_PBKDF2_ITERATIONS,
-                self::$_PBKDF2_HASH_BYTES,
-                true
-            )
-        );
-        
-        $passwordData = array(
-            self::$_PBKDF2_HASH_ALGORITHM,
-            self::$_PBKDF2_ITERATIONS,
-            $salt,
-            $hash
-        );
-        
-        return $passwordData;
-    }
-    
-    // Validates hashed password
-    public static function validate_password($password, $params) {
-        if(count($params) < self::$_HASH_SECTIONS);
-            return false;
-            
-        $pbkdf2 = base64_decode($params[self::$_HASH_PBKDF2_INDEX]);
-        
-        $validate = self::slow_equals(
-            $pbkdf2,
-            self::pbkdf2(
-                $params[self::$_HASH_ALGORITHM_INDEX],
-                $password,
-                $params[self::$_HASH_SALT_INDEX],
-                (int)$params[self::$_HASH_ITERATION_INDEX],
-                strlen($pbkdf2),
-                true
-            )
-        );
-        
-        return $validate;
-    }
-    
-    // Compares two strings $a and $b in length-constant time.
-    public static function slow_equals($a, $b) {
-        $diff = strlen($a) ^ strlen($b);
-        
-        for($i = 0; $i < strlen($a) && $i < strlen($b); $i++) {
-            $diff |= ord($a[$i]) ^ ord($b[$i]);
-        }
-        
-        return $diff === 0;
-    }
-    
-    /*
-    * PBKDF2 key derivation function as defined by RSA's PKCS #5: https://www.ietf.org/rfc/rfc2898.txt
-    * $algorithm - The hash algorithm to use. Recommended: SHA256
-    * $password - The password.
-    * $salt - A salt that is unique to the password.
-    * $count - Iteration count. Higher is better, but slower. Recommended: At least 1000.
-    * $key_length - The length of the derived key in bytes.
-    * $raw_output - If true, the key is returned in raw binary format. Hex encoded otherwise.
-    * Returns: A $key_length-byte key derived from the password and salt.
-    *
-    * Test vectors can be found here: https://www.ietf.org/rfc/rfc6070.txt
-    *
-    * This implementation of PBKDF2 was originally created by https://defuse.ca
-    * With improvements by http://www.variations-of-shadow.com
-    */
-    
-    private static function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false) {
-        $algorithm = strtolower($algorithm);
-        
-        if(!in_array($algorithm, hash_algos(), true))
-            trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
-        
-        if($count <= 0 || $key_length <= 0)
-            trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
-            
-        if(function_exists('hash_pbkdf2')) {
-            // The output length is in NIBBLES (4-bits) if $raw_output is false!
-            if($raw_output)
-                $key_length = $key_length * 2;
-                
-            return hash_pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output);
-        }
-        
-        $hash_length = strlen(hash($algorithm, '', true));
-        $block_count = ceil($key_length / $hash_length);
-        
-        $output = '';
-        
-        for($i = 1; $i <= $block_count; $i++) {
-            // $i encoded as 4 bytes, big endian.
-            $last = $salt . pack('N', $i);
-            
-            // First iteration
-            $last = $xorsum = hash_hmac($algorithm, $last, $password, true);
-            
-            // Perform the other $count - 1 interations
-            for($j = 1; $j < $count; $j++) {
-                $xorsum ^= ($last = hash_hmac($algorithm, $last, $password, true));
-            }
-            
-            $output .= $xorsum;
-            
-            if($raw_output)
-                return substr($output, 0, $key_length);
-            else
-                return bin2hex(substr($output, 0, $key_length));
-        }
-    }
-    
-}
diff --git a/_sakura/components/main.php b/_sakura/components/main.php
deleted file mode 100644
index 9ecb39d..0000000
--- a/_sakura/components/main.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/*
- * Main Class
- */
- 
-namespace Flashii;
-
-class Flashii {
-
-	public static $_CONF;
-	public static $_DB;
-    public $twig;
-
-	// Constructor
-	function __construct($config) {
-		// Stop the execution if the PHP Version is older than 5.4.0
-		if(version_compare(phpversion(), '5.4.0', '<'))
-			die('<h3>Upgrade your PHP Version to at least PHP 5.4!</h3>');
-	
-		// Assign $config values to $_CONF
-		self::$_CONF = $config;
-		
-		// Initialise database
-		self::$_DB = new Database();
-	}
-    
-	// Get values from the configuration
-	public static function getConfig($key, $subkey = null) {
-		if(array_key_exists($key, self::$_CONF)) {
-			if($subkey)
-				return self::$_CONF[$key][$subkey];
-			else
-				return self::$_CONF[$key];
-		} else {
-			return false;
-        }
-	}
-    
-    // Initialise Twig
-    public function initTwig($templateName = null, $templatesFolder = null) {
-        // Assign default values set in the configuration if $templateName and $templatesFolder are null
-        $templateName       = is_null($templateName)    ? self::getConfig('etc', 'design')          : $templateName;
-        $templatesFolder    = is_null($templatesFolder) ? self::getConfig('etc', 'templatesPath')   : $templatesFolder;
-        
-        // Initialise Twig Filesystem Loader
-        $twigLoader = new \Twig_Loader_Filesystem($templatesFolder . $templateName);
-
-        // And now actually initialise the templating engine
-        $this->twig = new \Twig_Environment($twigLoader, array(
-           // 'cache' => $satoko['cacheFolder']
-        ));
-    }
-	
-	// Error Handler
-	public static function ErrorHandler($errno, $errstr, $errfile, $errline) {
-        // Set some variables to work with including A HUGE fallback hackjob for the templates folder
-        $errstr     = str_replace(self::getConfig('etc', 'localPath'), '', $errstr);
-        $errfile    = str_replace(self::getConfig('etc', 'localPath'), '', $errfile);
-        $templates  = (self::getConfig('etc', 'templatesPath') !== null && !empty(self::getConfig('etc', 'templatesPath'))) ? self::getConfig('etc', 'templatesPath') : '/var/www/flashii.net/_sakuya/templates/';
-        
-		switch ($errno) {
-			case E_ERROR:
-			case E_USER_ERROR:
-				$error = '<b>FATAL ERROR</b>: ' . $errstr . ' on line ' . $errline . ' in ' . $errfile;
-			break;
-
-			case E_WARNING:
-			case E_USER_WARNING:
-				$error = '<b>WARNING</b>: ' . $errstr . ' on line ' . $errline . ' in ' . $errfile;
-			break;
-
-			case E_NOTICE:
-			case E_USER_NOTICE:
-				$error = '<b>NOTICE</b>: ' . $errstr . ' on line ' . $errline . ' in ' . $errfile;
-			break;
-
-			default:
-				$error = '<b>Unknown error type</b> [' . $errno . ']: ' . $errstr . ' on line ' . $errline . ' in ' . $errfile;
-			break;
-		}
-        
-        // Use file_get_contents instead of Twig in case the problem is related to twig
-        $errorPage = file_get_contents($templates. 'errorPage.tpl');
-        
-        // str_replace {{ error }} on the error page with the error data
-        $error = str_replace('{{ error }}', $error, $errorPage);
-        
-		// Truncate all previous outputs
-		ob_clean();
-
-		// Die and display error message
-		die($error);
-	}
-    
-    // Legacy password hashing to be able to validate passwords from users on the old backend.
-    public static function legacyPasswordHash($data) {
-        return hash('sha512', strrev(hash('sha512', $data)));
-    }
-    
-}
\ No newline at end of file