diff --git a/bin/prepare.php b/bin/prepare.php
index a135c9b9c..b5c9f429c 100644
--- a/bin/prepare.php
+++ b/bin/prepare.php
@@ -5,10 +5,10 @@ $pathAppRoot = $pathApp . '/src';
 $pathAppInstall = $pathApp . '/src/install';
 $config = include $pathAppRoot . '/bb-config.php';
 
-$structureSql = '/structure.sql';
-$contentSql = '/content_test.sql';
+$structureSql = '/sql/structure.sql';
+$contentSql = '/sql/content_test.sql';
 if (isset($argv[1]) && $argv[1] == 'production') {
-    $contentSql = '/content.sql';
+    $contentSql = '/sql/content.sql';
     echo "Production content" . PHP_EOL;
 }
 
diff --git a/src/bb-config-sample.php b/src/bb-config-sample.php
index 8b14beedc..78b1daa83 100755
--- a/src/bb-config-sample.php
+++ b/src/bb-config-sample.php
@@ -4,8 +4,8 @@
  *
  * If you are not using the web-installer, you can rename this file
  * to "bb-config.php" and fill in the values.
- * Import /install/structure.sql to your database
- * Import /install/content.sql to your database
+ * Import /install/sql/structure.sql to your database
+ * Import /install/sql/content.sql to your database
  * Open browser http://www.yourdomain.com/index.php?_url=/bb-admin to create new admin account.
  * Remove /install directory
  */
diff --git a/src/install/css/main.css b/src/install/assets/css/main.css
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/css/main.css
rename to src/install/assets/css/main.css
diff --git a/src/install/images/adminUser.png b/src/install/assets/images/adminUser.png
similarity index 100%
rename from src/install/images/adminUser.png
rename to src/install/assets/images/adminUser.png
diff --git a/src/install/images/alert2.png b/src/install/assets/images/alert2.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/alert2.png
rename to src/install/assets/images/alert2.png
diff --git a/src/install/images/bodyBg.jpg b/src/install/assets/images/bodyBg.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/bodyBg.jpg
rename to src/install/assets/images/bodyBg.jpg
diff --git a/src/install/images/book.png b/src/install/assets/images/book.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/book.png
rename to src/install/assets/images/book.png
diff --git a/src/install/images/bubbles2.png b/src/install/assets/images/bubbles2.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/bubbles2.png
rename to src/install/assets/images/bubbles2.png
diff --git a/src/install/images/cog4.png b/src/install/assets/images/cog4.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/cog4.png
rename to src/install/assets/images/cog4.png
diff --git a/src/install/images/doc.png b/src/install/assets/images/doc.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/doc.png
rename to src/install/assets/images/doc.png
diff --git a/src/install/images/flag.png b/src/install/assets/images/flag.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/flag.png
rename to src/install/assets/images/flag.png
diff --git a/src/install/images/leftNavBg.png b/src/install/assets/images/leftNavBg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/leftNavBg.png
rename to src/install/assets/images/leftNavBg.png
diff --git a/src/install/images/loader.gif b/src/install/assets/images/loader.gif
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/loader.gif
rename to src/install/assets/images/loader.gif
diff --git a/src/install/images/middlebg.png b/src/install/assets/images/middlebg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/middlebg.png
rename to src/install/assets/images/middlebg.png
diff --git a/src/install/images/topNav.jpg b/src/install/assets/images/topNav.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/topNav.jpg
rename to src/install/assets/images/topNav.jpg
diff --git a/src/install/images/ui/basicBtn.png b/src/install/assets/images/ui/basicBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/basicBtn.png
rename to src/install/assets/images/ui/basicBtn.png
diff --git a/src/install/images/ui/blackBtn.png b/src/install/assets/images/ui/blackBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/blackBtn.png
rename to src/install/assets/images/ui/blackBtn.png
diff --git a/src/install/images/ui/blueBtn.png b/src/install/assets/images/ui/blueBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/blueBtn.png
rename to src/install/assets/images/ui/blueBtn.png
diff --git a/src/install/images/ui/greenBtn.png b/src/install/assets/images/ui/greenBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/greenBtn.png
rename to src/install/assets/images/ui/greenBtn.png
diff --git a/src/install/images/ui/greyishBtn.png b/src/install/assets/images/ui/greyishBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/greyishBtn.png
rename to src/install/assets/images/ui/greyishBtn.png
diff --git a/src/install/images/ui/handle.png b/src/install/assets/images/ui/handle.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/handle.png
rename to src/install/assets/images/ui/handle.png
diff --git a/src/install/images/ui/numDataBg.png b/src/install/assets/images/ui/numDataBg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/numDataBg.png
rename to src/install/assets/images/ui/numDataBg.png
diff --git a/src/install/images/ui/pagination.png b/src/install/assets/images/ui/pagination.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/pagination.png
rename to src/install/assets/images/ui/pagination.png
diff --git a/src/install/images/ui/progress.png b/src/install/assets/images/ui/progress.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/progress.png
rename to src/install/assets/images/ui/progress.png
diff --git a/src/install/images/ui/progressOverlay.png b/src/install/assets/images/ui/progressOverlay.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/progressOverlay.png
rename to src/install/assets/images/ui/progressOverlay.png
diff --git a/src/install/images/ui/redBtn.png b/src/install/assets/images/ui/redBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/redBtn.png
rename to src/install/assets/images/ui/redBtn.png
diff --git a/src/install/images/ui/seaBtn.png b/src/install/assets/images/ui/seaBtn.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/seaBtn.png
rename to src/install/assets/images/ui/seaBtn.png
diff --git a/src/install/images/ui/sliderBg.png b/src/install/assets/images/ui/sliderBg.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderBg.png
rename to src/install/assets/images/ui/sliderBg.png
diff --git a/src/install/images/ui/sliderBgVert.png b/src/install/assets/images/ui/sliderBgVert.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderBgVert.png
rename to src/install/assets/images/ui/sliderBgVert.png
diff --git a/src/install/images/ui/sliderOverlay.png b/src/install/assets/images/ui/sliderOverlay.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderOverlay.png
rename to src/install/assets/images/ui/sliderOverlay.png
diff --git a/src/install/images/ui/sliderOverlayVert.png b/src/install/assets/images/ui/sliderOverlayVert.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/sliderOverlayVert.png
rename to src/install/assets/images/ui/sliderOverlayVert.png
diff --git a/src/install/images/ui/spinnerUpDown.png b/src/install/assets/images/ui/spinnerUpDown.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/spinnerUpDown.png
rename to src/install/assets/images/ui/spinnerUpDown.png
diff --git a/src/install/images/ui/uploadDisabled.png b/src/install/assets/images/ui/uploadDisabled.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/ui/uploadDisabled.png
rename to src/install/assets/images/ui/uploadDisabled.png
diff --git a/src/install/images/user.png b/src/install/assets/images/user.png
similarity index 100%
rename from src/install/images/user.png
rename to src/install/assets/images/user.png
diff --git a/src/install/images/vault.png b/src/install/assets/images/vault.png
old mode 100755
new mode 100644
similarity index 100%
rename from src/install/images/vault.png
rename to src/install/assets/images/vault.png
diff --git a/src/install/install.phtml b/src/install/assets/install.phtml
similarity index 96%
rename from src/install/install.phtml
rename to src/install/assets/install.phtml
index 576b60fb7..93f828fae 100644
--- a/src/install/install.phtml
+++ b/src/install/assets/install.phtml
@@ -1,4 +1,4 @@
-{% extends "layout.phtml" %}
+{% extends "./assets/layout.phtml" %}
 
 {% block left %}
         <div class="widget nomargin step step-1">
@@ -33,8 +33,8 @@
             <div class="head"><h5 class="iAlert">Well done!</h5></div>
             <div class="body aligncenter">
                 <p>Thank you for choosing BoxBilling</p>
-                <a href="{{ live_site }}" title="" class="btnIconLeft mr10 mt10" target="_blank"><img src="images/user.png" alt="" class="icon"><span>Client area</span></a>
-                <a href="{{ admin_site }}" title="" class="btnIconLeft mr10 mt10" target="_blank"><img src="images/adminUser.png" alt="" class="icon"><span>Admin area</span></a>
+                <a href="{{ live_site }}" title="" class="btnIconLeft mr10 mt10" target="_blank"><img src="./assets/images/user.png" alt="" class="icon"><span>Client area</span></a>
+                <a href="{{ admin_site }}" title="" class="btnIconLeft mr10 mt10" target="_blank"><img src="./assets/images/adminUser.png" alt="" class="icon"><span>Admin area</span></a>
             </div>
         </div>
 
@@ -61,9 +61,9 @@
                                     If you can not enable JavaScript for some reason you can follow these steps in
                                     order to setup BoxBilling: <br/>
                                     * Rename "bb-config-sample.php" file to "bb-config.php", fill in the values and change this file permissions to read only (CHMOD 644).<br/>
-                                    * Import /install/structure.sql to your database<br/>
-                                    * Import /install/content.sql to your database<br/>
-                                    * Open browser <a href="{{constant("BB_URL")}}index.php?_url=/bb-admin">{{constant("BB_URL")}}index.php?_url=/bb-admin</a> to create new admin
+                                    * Import /install/sql/structure.sql to your database<br/>
+                                    * Import /install/sql/content.sql to your database<br/>
+                                    * Open browser <a href="{{constant('BB_URL')}}index.php?_url=/bb-admin">{{constant("BB_URL")}}index.php?_url=/bb-admin</a> to create new admin
                                     account.<br/>
                                     * Remove /install directory<br/>
                                 </p>
@@ -233,8 +233,8 @@
 
 {% block js %}
 <div id="overlay" style="position: absolute; display: none; z-index: 1000; background-color: whitesmoke; width: 725px; height: 50px; opacity:0.5;"></div>
-<script src="jquery.min.js" type="text/javascript"></script>
-<script src="jquery.smartWizard.js" type="text/javascript"></script>
+<script src="./assets/js/jquery.min.js" type="text/javascript"></script>
+<script src="./assets/js/jquery.smartWizard.js" type="text/javascript"></script>
 <script type="text/javascript">
 $(function() {
 	$('.wizard').smartWizard({
@@ -279,7 +279,7 @@ $(function() {
     }
     
     function validateSteps(stepnumber){
-        var url = '{{constant("BB_URL_INSTALL")}}index.php?a=';
+        var url = '{{constant("BB_URL_INSTALL")}}install.php?a=';
         var data = $('#installer').serialize();
         var ok = false;
 
diff --git a/src/install/jquery.min.js b/src/install/assets/js/jquery.min.js
similarity index 100%
rename from src/install/jquery.min.js
rename to src/install/assets/js/jquery.min.js
diff --git a/src/install/jquery.smartWizard.js b/src/install/assets/js/jquery.smartWizard.js
similarity index 100%
rename from src/install/jquery.smartWizard.js
rename to src/install/assets/js/jquery.smartWizard.js
diff --git a/src/install/layout.phtml b/src/install/assets/layout.phtml
similarity index 88%
rename from src/install/layout.phtml
rename to src/install/assets/layout.phtml
index 5782d6513..f72bf148c 100644
--- a/src/install/layout.phtml
+++ b/src/install/assets/layout.phtml
@@ -4,13 +4,13 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>BoxBilling setup</title>
     <base href="{{ constant('BB_URL_INSTALL') }}"/>
-    <link href="css/main.css" rel="stylesheet" type="text/css" />
+    <link href="./assets/css/main.css" rel="stylesheet" type="text/css" />
     <link href="https://fonts.googleapis.com/css?family=Cuprum" rel="stylesheet" type="text/css" />
 </head>
 
 <body>
 <div id="header" class="wrapper">
-    <div class="logo"><a href="{{ constant('BB_URL_INSTALL') }}" title="BoxBilling"><img src="/bb-themes/boxbilling/assets/images/logo.png" alt="" style="max-height: 50px"/></a></div>
+    <div class="logo"><a href="{{ constant('BB_URL_INSTALL') }}" title="BoxBilling"><img src="../bb-themes/boxbilling/assets/images/logo.png" alt="" style="max-height: 50px"/></a></div>
     <div class="middleNav">
     	<ul>
             <li class="iForum"><a href="http://www.boxbilling.com/forum" target="_blank" title="Invoicing, billing and client management software forum"><span>Forums</span></a></li>
diff --git a/src/install/index.php b/src/install/index.php
index 5c0e91873..6d961597c 100644
--- a/src/install/index.php
+++ b/src/install/index.php
@@ -1,418 +1,3 @@
-<?php
-/**
- * @return bool
- * @see http://stackoverflow.com/a/2886224/2728507
- */
-function isSSL()
-{
-    return
-        (!empty($_SERVER['HTTPS']) && 'off' !== $_SERVER['HTTPS'])
-        || 443 == $_SERVER['SERVER_PORT'];
-}
-
-date_default_timezone_set('UTC');
-
-error_reporting(E_ALL);
-ini_set('display_errors', 0);
-ini_set('display_startup_errors', 1);
-ini_set('log_errors', '1');
-ini_set('error_log', dirname(__FILE__) . '/php_error.log');
-
-$protocol = isSSL() ? 'https' : 'http';
-$url = $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-$current_url = pathinfo($url, PATHINFO_DIRNAME);
-$root_url = str_replace('/install', '', $current_url) . '/';
-
-define('BB_URL', $root_url);
-define('BB_URL_INSTALL', BB_URL . 'install/');
-define('BB_URL_ADMIN', BB_URL . 'index.php?_url=/bb-admin');
-
-define('BB_PATH_ROOT', realpath(dirname(__FILE__) . '/..'));
-define('BB_PATH_LIBRARY', BB_PATH_ROOT . '/bb-library');
-define('BB_PATH_VENDOR', BB_PATH_ROOT . '/bb-vendor');
-define('BB_PATH_THEMES', BB_PATH_ROOT . '/install');
-define('BB_PATH_LICENSE', BB_PATH_ROOT . '/LICENSE');
-define('BB_PATH_SQL', BB_PATH_ROOT . '/install/structure.sql');
-define('BB_PATH_SQL_DATA', BB_PATH_ROOT . '/install/content.sql');
-define('BB_PATH_INSTALL', BB_PATH_ROOT . '/install');
-define('BB_PATH_CONFIG', BB_PATH_ROOT . '/bb-config.php');
-define('BB_PATH_CRON', BB_PATH_ROOT . '/bb-cron.php');
-
-// Ensure library/ is on include_path
-set_include_path(implode(PATH_SEPARATOR, [
-    BB_PATH_LIBRARY,
-    get_include_path(),
-]));
-
-require BB_PATH_VENDOR . '/autoload.php';
-
-final class Box_Installer
-{
-    private $session;
-
-    public function __construct()
-    {
-        include 'session.php';
-        $this->session = new Session();
-    }
-
-    public function run($action)
-    {
-        switch ($action) {
-            case 'check-db':
-                $user = $_POST['db_user'];
-                $host = $_POST['db_host'];
-                $pass = $_POST['db_pass'];
-                $name = $_POST['db_name'];
-                if (!$this->canConnectToDatabase($host, $name, $user, $pass)) {
-                    print 'Could not connect to database. Please check database details. You might need to create database first.';
-                } else {
-                    $this->session->set('db_host', $host);
-                    $this->session->set('db_name', $name);
-                    $this->session->set('db_user', $user);
-                    $this->session->set('db_pass', $pass);
-                    print 'ok';
-                }
-
-                break;
-
-            case 'install':
-                try {
-                    // Initializing database connection
-                    $user = $_POST['db_user'];
-                    $host = $_POST['db_host'];
-                    $pass = $_POST['db_pass'];
-                    $name = $_POST['db_name'];
-                    if (!$this->canConnectToDatabase($host, $name, $user, $pass)) {
-                        throw new Exception('Could not connect to the database, or the database does not exist');
-                    } else {
-                        $this->session->set('db_host', $host);
-                        $this->session->set('db_name', $name);
-                        $this->session->set('db_user', $user);
-                        $this->session->set('db_pass', $pass);
-                    }
-
-                    // Configuring administrator's account
-                    $admin_email = $_POST['admin_email'];
-                    $admin_pass = $_POST['admin_pass'];
-                    $admin_name = $_POST['admin_name'];
-                    if (!$this->isValidAdmin($admin_email, $admin_pass, $admin_name)) {
-                        throw new Exception('Administrator\'s account is not valid');
-                    } else {
-                        $this->session->set('admin_email', $admin_email);
-                        $this->session->set('admin_pass', $admin_pass);
-                        $this->session->set('admin_name', $admin_name);
-                    }
-
-                    $this->session->set('license', "BoxBilling CE");
-                    $this->makeInstall($this->session);
-                    $this->generateEmailTemplates();
-                    session_destroy();
-                    // Try to remove install folder
-                    function rmAllDir($dir) {
-                        if (is_dir($dir)) {
-                          $contents = scandir($dir);
-                          foreach ($contents as $content) {
-                            if ($content != '.' && $content != '..') {
-                              if (filetype($dir.'/'.$content) == 'dir') {
-                                rmAllDir($dir.'/'.$content); 
-                              }
-                              else {
-                                unlink($dir.'/'.$content);
-                              }
-                            }
-                          }
-                          reset($contents);
-                          rmdir($dir);
-                        }
-                    }
-                    try {
-                        rmAllDir('../install');
-                    }
-                    catch(Exception $e) {
-                        // do nothing
-                    }
-                    print 'ok';
-                } catch (Exception $e) {
-                    print $e->getMessage();
-                }
-                break;
-
-            case 'index':
-            default:
-                $this->session->set('agree', true);
-
-                $se = new Box_Requirements();
-                $options = $se->getOptions();
-                $vars = [
-                    'tos' => $this->getLicense(),
-
-                    'folders' => $se->folders(),
-                    'files' => $se->files(),
-                    'os' => PHP_OS,
-                    'os_ok' => true,
-                    'box_ver' => Box_Version::VERSION,
-                    'box_ver_ok' => $se->isBoxVersionOk(),
-                    'php_ver' => $options['php']['version'],
-                    'php_ver_req' => $options['php']['min_version'],
-                    'php_safe_mode' => $options['php']['safe_mode'],
-                    'php_ver_ok' => $se->isPhpVersionOk(),
-                    'extensions' => $se->extensions(),
-                    'all_ok' => $se->canInstall(),
-
-                    'db_host' => $this->session->get('db_host'),
-                    'db_name' => $this->session->get('db_name'),
-                    'db_user' => $this->session->get('db_user'),
-                    'db_pass' => $this->session->get('db_pass'),
-
-                    'admin_email' => $this->session->get('admin_email'),
-                    'admin_pass' => $this->session->get('admin_pass'),
-                    'admin_name' => $this->session->get('admin_name'),
-
-                    'license' => $this->session->get('license'),
-                    'agree' => $this->session->get('agree'),
-
-                    'install_module_path' => BB_PATH_INSTALL,
-                    'cron_path' => BB_PATH_CRON,
-                    'config_file_path' => BB_PATH_CONFIG,
-                    'live_site' => BB_URL,
-                    'admin_site' => BB_URL_ADMIN,
-
-                    'domain' => pathinfo(BB_URL, PATHINFO_BASENAME),
-                ];
-                print $this->render('install.phtml', $vars);
-                break;
-        }
-    }
-
-    private function render($name, $vars = [])
-    {
-        $options = [
-            'paths' => [BB_PATH_THEMES],
-            'debug' => true,
-            'charset' => 'utf-8',
-            'optimizations' => 1,
-            'autoescape' => 'html',
-            'auto_reload' => true,
-            'cache' => false,
-        ];
-        $loader = new \Twig\Loader\FilesystemLoader($options['paths']);
-        $twig = new Twig\Environment($loader, $options);
-        //$twig->addExtension(new Twig_Extension_Optimizer());
-        $twig->addGlobal('request', $_REQUEST);
-        $twig->addGlobal('version', Box_Version::VERSION);
-        return $twig->render($name, $vars);
-    }
-
-    private function getLicense()
-    {
-        $path = BB_PATH_LICENSE;
-        if (!file_exists($path)) {
-            return 'BoxBilling is licensed under the Apache License, Version 2.0.'.PHP_EOL.'Please visit https://github.com/boxbilling/boxbilling/blob/master/LICENSE for full license text.';
-        }
-        return file_get_contents($path);
-    }
-
-    private function getPdo($host, $db, $user, $pass)
-    {
-        $pdo = new \PDO('mysql:host='.$host,
-            $user,
-            $pass,
-            array(
-                \PDO::MYSQL_ATTR_USE_BUFFERED_QUERY         => true,
-                \PDO::ATTR_ERRMODE                          => \PDO::ERRMODE_EXCEPTION,
-                \PDO::ATTR_DEFAULT_FETCH_MODE               => \PDO::FETCH_ASSOC,
-            )
-        );
-
-        $pdo->exec( 'SET NAMES "utf8"' );
-        $pdo->exec( 'SET CHARACTER SET utf8' );
-        $pdo->exec( 'SET CHARACTER_SET_CONNECTION = utf8' );
-        $pdo->exec( 'SET CHARACTER_SET_DATABASE = utf8' );
-        $pdo->exec( 'SET character_set_results = utf8' );
-        $pdo->exec( 'SET character_set_server = utf8' );
-        $pdo->exec( 'SET SESSION interactive_timeout = 28800' );
-        $pdo->exec( 'SET SESSION wait_timeout = 28800' );
-
-        // try create database if permissions allows
-        try {
-            $pdo->exec("CREATE DATABASE `$db` CHARACTER SET utf8 COLLATE utf8_general_ci;");
-        } catch (PDOException $e) {
-            error_log($e->getMessage());
-        }
-
-        $pdo->query("USE $db;");
-        return $pdo;
-    }
-
-    private function canConnectToDatabase($host, $db, $user, $pass)
-    {
-        try {
-            $this->getPdo($host, $db, $user, $pass);
-        } catch (\Exception $e) {
-            error_log($e->getMessage());
-            return false;
-        }
-        return true;
-    }
-
-    private function isValidAdmin($email, $pass, $name)
-    {
-        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            return false;
-        }
-
-        if (empty($pass)) {
-            return false;
-        }
-
-        if (empty($name)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private function makeInstall($ns)
-    {
-        $this->_isValidInstallData($ns);
-        $this->_createConfigurationFile($ns);
-
-        $pdo = $this->getPdo($ns->get('db_host'), $ns->get('db_name'), $ns->get('db_user'), $ns->get('db_pass'));
-
-        $sql = file_get_contents(BB_PATH_SQL);
-        $sql_content = file_get_contents(BB_PATH_SQL_DATA);
-
-        if (!$sql || !$sql_content) {
-            throw new Exception('Could not read structure.sql file');
-        }
-
-        $sql .= $sql_content;
-
-        $sql = preg_split('/\;[\r]*\n/ism', $sql);
-        $sql = array_map('trim', $sql);
-        $err = '';
-        foreach ($sql as $query) {
-            if (!trim($query)) {
-                continue;
-            }
-
-            $res = $pdo->query($query);
-        }
-
-        $passwordObject = new \Box_Password();
-        $stmt = $pdo->prepare("INSERT INTO admin (role, name, email, pass, protected, created_at, updated_at) VALUES('admin', :admin_name, :admin_email, :admin_pass, 1, NOW(), NOW());");
-        $stmt->execute(array(
-            'admin_name'  => $ns->get('admin_name'),
-            'admin_email' => $ns->get('admin_email'),
-            'admin_pass'  => $passwordObject->hashIt($ns->get('admin_pass')),
-        ));
-
-        try {
-            $this->_sendMail($ns);
-        } catch (Exception $e) {
-            // E-mail was not sent, but that is not a problem
-            error_log($e->getMessage());
-        }
-
-        return true;
-    }
-
-    private function _sendMail($ns)
-    {
-        $admin_name = $ns->get('admin_name');
-        $admin_email = $ns->get('admin_email');
-        $admin_pass = $ns->get('admin_pass');
-
-        $content = "Hi $admin_name, " . PHP_EOL;
-        $content .= "You have successfully setup BoxBilling at " . BB_URL . PHP_EOL;
-        $content .= "Access client area at: " . BB_URL . PHP_EOL;
-        $content .= "Access admin area at: " . BB_URL_ADMIN . " with login details:" . PHP_EOL;
-        $content .= "E-mail: " . $admin_email . PHP_EOL;
-        $content .= "Password: " . $admin_pass . PHP_EOL . PHP_EOL;
-
-        $content .= "Read BoxBilling documentation to get started https://docs.boxbilling.com/" . PHP_EOL;
-        $content .= "Thank You for using BoxBilling." . PHP_EOL;
-
-        $subject = sprintf('BoxBilling is ready at "%s"', BB_URL);
-
-        @mail($admin_email, $subject, $content);
-    }
-
-    private function _createConfigurationFile($data)
-    {
-        $output = $this->_getConfigOutput($data);
-        if (!@file_put_contents(BB_PATH_CONFIG, $output)) {
-            throw new Exception('Configuration file is not writable or does not exist. Please create the file at ' . BB_PATH_CONFIG . ' and make it writable', 101);
-        }
-    }
-
-    private function _getConfigOutput($ns)
-    {
-        $data = [
-            'debug' => false,
-            'salt' => md5(uniqid()),
-            'url' => BB_URL,
-            'admin_area_prefix' => '/bb-admin',
-            'sef_urls' => true,
-            'timezone' => 'UTC',
-            'locale' => 'en_US',
-            'locale_date_format' => '%A, %d %B %G',
-            'locale_time_format' => ' %T',
-            'path_data' => BB_PATH_ROOT . '/bb-data',
-            'path_logs' => BB_PATH_ROOT . '/bb-data/log/application.log',
-
-            'log_to_db' => true,
-
-            'db' => [
-                'type' => 'mysql',
-                'host' => $ns->get('db_host'),
-                'name' => $ns->get('db_name'),
-                'user' => $ns->get('db_user'),
-                'password' => $ns->get('db_pass'),
-            ],
-
-            'twig' => [
-                'debug' => true,
-                'auto_reload' => true,
-                'cache' => BB_PATH_ROOT . '/bb-data/cache',
-            ],
-
-            'api' => [
-                'require_referrer_header' => false,
-                'allowed_ips' => [],
-                'rate_span' => 60 * 60,
-                'rate_limit' => 1000,
-            ],
-        ];
-        $output = '<?php ' . PHP_EOL;
-        $output .= 'return ' . var_export($data, true) . ';';
-        return $output;
-    }
-
-    private function _isValidInstallData($ns)
-    {
-        if (!$this->canConnectToDatabase($ns->get('db_host'), $ns->get('db_name'), $ns->get('db_user'), $ns->get('db_pass'))) {
-            throw new Exception('Can not connect to database');
-        }
-
-        if (!$this->isValidAdmin($ns->get('admin_email'), $ns->get('admin_pass'), $ns->get('admin_name'))) {
-            throw new Exception('Administrators account is not valid');
-        }
-    }
-
-    private function generateEmailTemplates()
-    {
-        define('BB_PATH_MODS', BB_PATH_ROOT . '/bb-modules');
-
-        $emailService = new \Box\Mod\Email\Service();
-        $di = $di = include BB_PATH_ROOT . '/bb-di.php';
-        $di['translate']();
-        $emailService->setDi($di);
-        return $emailService->templateBatchGenerate();
-    }
-}
-
-$action = isset($_GET['a']) ? $_GET['a'] : 'index';
-$installer = new Box_Installer;
-$installer->run($action);
+<?php 
+header("Location: " . pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME) . "/install.php");
+exit();
\ No newline at end of file
diff --git a/src/install/install.php b/src/install/install.php
new file mode 100644
index 000000000..c21cb763f
--- /dev/null
+++ b/src/install/install.php
@@ -0,0 +1,418 @@
+<?php
+/**
+ * @return bool
+ * @see http://stackoverflow.com/a/2886224/2728507
+ */
+function isSSL()
+{
+    return
+        (!empty($_SERVER['HTTPS']) && 'off' !== $_SERVER['HTTPS'])
+        || 443 == $_SERVER['SERVER_PORT'];
+}
+
+date_default_timezone_set('UTC');
+
+error_reporting(E_ALL);
+ini_set('display_errors', 0);
+ini_set('display_startup_errors', 1);
+ini_set('log_errors', '1');
+ini_set('error_log', dirname(__FILE__) . '/logs/php_error.log');
+
+$protocol = isSSL() ? 'https' : 'http';
+$url = $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+$current_url = pathinfo($url, PATHINFO_DIRNAME);
+$root_url = str_replace('/install', '', $current_url) . '/';
+
+define('BB_URL', $root_url);
+define('BB_URL_INSTALL', BB_URL . 'install/');
+define('BB_URL_ADMIN', BB_URL . 'index.php?_url=/bb-admin');
+
+define('BB_PATH_ROOT', realpath(dirname(__FILE__) . '/..'));
+define('BB_PATH_LIBRARY', BB_PATH_ROOT . '/bb-library');
+define('BB_PATH_VENDOR', BB_PATH_ROOT . '/bb-vendor');
+define('BB_PATH_THEMES', BB_PATH_ROOT . '/install');
+define('BB_PATH_LICENSE', BB_PATH_ROOT . '/LICENSE');
+define('BB_PATH_SQL', BB_PATH_ROOT . '/install/sql/structure.sql');
+define('BB_PATH_SQL_DATA', BB_PATH_ROOT . '/install/sql/content.sql');
+define('BB_PATH_INSTALL', BB_PATH_ROOT . '/install');
+define('BB_PATH_CONFIG', BB_PATH_ROOT . '/bb-config.php');
+define('BB_PATH_CRON', BB_PATH_ROOT . '/bb-cron.php');
+
+// Ensure library/ is on include_path
+set_include_path(implode(PATH_SEPARATOR, [
+    BB_PATH_LIBRARY,
+    get_include_path(),
+]));
+
+require BB_PATH_VENDOR . '/autoload.php';
+
+final class Box_Installer
+{
+    private $session;
+
+    public function __construct()
+    {
+        include 'session.php';
+        $this->session = new Session();
+    }
+
+    public function run($action)
+    {
+        switch ($action) {
+            case 'check-db':
+                $user = $_POST['db_user'];
+                $host = $_POST['db_host'];
+                $pass = $_POST['db_pass'];
+                $name = $_POST['db_name'];
+                if (!$this->canConnectToDatabase($host, $name, $user, $pass)) {
+                    print 'Could not connect to database. Please check database details. You might need to create database first.';
+                } else {
+                    $this->session->set('db_host', $host);
+                    $this->session->set('db_name', $name);
+                    $this->session->set('db_user', $user);
+                    $this->session->set('db_pass', $pass);
+                    print 'ok';
+                }
+
+                break;
+
+            case 'install':
+                try {
+                    // Initializing database connection
+                    $user = $_POST['db_user'];
+                    $host = $_POST['db_host'];
+                    $pass = $_POST['db_pass'];
+                    $name = $_POST['db_name'];
+                    if (!$this->canConnectToDatabase($host, $name, $user, $pass)) {
+                        throw new Exception('Could not connect to the database, or the database does not exist');
+                    } else {
+                        $this->session->set('db_host', $host);
+                        $this->session->set('db_name', $name);
+                        $this->session->set('db_user', $user);
+                        $this->session->set('db_pass', $pass);
+                    }
+
+                    // Configuring administrator's account
+                    $admin_email = $_POST['admin_email'];
+                    $admin_pass = $_POST['admin_pass'];
+                    $admin_name = $_POST['admin_name'];
+                    if (!$this->isValidAdmin($admin_email, $admin_pass, $admin_name)) {
+                        throw new Exception('Administrator\'s account is not valid');
+                    } else {
+                        $this->session->set('admin_email', $admin_email);
+                        $this->session->set('admin_pass', $admin_pass);
+                        $this->session->set('admin_name', $admin_name);
+                    }
+
+                    $this->session->set('license', "BoxBilling CE");
+                    $this->makeInstall($this->session);
+                    $this->generateEmailTemplates();
+                    session_destroy();
+                    // Try to remove install folder
+                    function rmAllDir($dir) {
+                        if (is_dir($dir)) {
+                          $contents = scandir($dir);
+                          foreach ($contents as $content) {
+                            if ($content != '.' && $content != '..') {
+                              if (filetype($dir.'/'.$content) == 'dir') {
+                                rmAllDir($dir.'/'.$content); 
+                              }
+                              else {
+                                unlink($dir.'/'.$content);
+                              }
+                            }
+                          }
+                          reset($contents);
+                          rmdir($dir);
+                        }
+                    }
+                    try {
+                        rmAllDir('../install');
+                    }
+                    catch(Exception $e) {
+                        // do nothing
+                    }
+                    print 'ok';
+                } catch (Exception $e) {
+                    print $e->getMessage();
+                }
+                break;
+
+            case 'index':
+            default:
+                $this->session->set('agree', true);
+
+                $se = new Box_Requirements();
+                $options = $se->getOptions();
+                $vars = [
+                    'tos' => $this->getLicense(),
+
+                    'folders' => $se->folders(),
+                    'files' => $se->files(),
+                    'os' => PHP_OS,
+                    'os_ok' => true,
+                    'box_ver' => Box_Version::VERSION,
+                    'box_ver_ok' => $se->isBoxVersionOk(),
+                    'php_ver' => $options['php']['version'],
+                    'php_ver_req' => $options['php']['min_version'],
+                    'php_safe_mode' => $options['php']['safe_mode'],
+                    'php_ver_ok' => $se->isPhpVersionOk(),
+                    'extensions' => $se->extensions(),
+                    'all_ok' => $se->canInstall(),
+
+                    'db_host' => $this->session->get('db_host'),
+                    'db_name' => $this->session->get('db_name'),
+                    'db_user' => $this->session->get('db_user'),
+                    'db_pass' => $this->session->get('db_pass'),
+
+                    'admin_email' => $this->session->get('admin_email'),
+                    'admin_pass' => $this->session->get('admin_pass'),
+                    'admin_name' => $this->session->get('admin_name'),
+
+                    'license' => $this->session->get('license'),
+                    'agree' => $this->session->get('agree'),
+
+                    'install_module_path' => BB_PATH_INSTALL,
+                    'cron_path' => BB_PATH_CRON,
+                    'config_file_path' => BB_PATH_CONFIG,
+                    'live_site' => BB_URL,
+                    'admin_site' => BB_URL_ADMIN,
+
+                    'domain' => pathinfo(BB_URL, PATHINFO_BASENAME),
+                ];
+                print $this->render('./assets/install.phtml', $vars);
+                break;
+        }
+    }
+
+    private function render($name, $vars = [])
+    {
+        $options = [
+            'paths' => [BB_PATH_THEMES],
+            'debug' => true,
+            'charset' => 'utf-8',
+            'optimizations' => 1,
+            'autoescape' => 'html',
+            'auto_reload' => true,
+            'cache' => false,
+        ];
+        $loader = new \Twig\Loader\FilesystemLoader($options['paths']);
+        $twig = new Twig\Environment($loader, $options);
+        //$twig->addExtension(new Twig_Extension_Optimizer());
+        $twig->addGlobal('request', $_REQUEST);
+        $twig->addGlobal('version', Box_Version::VERSION);
+        return $twig->render($name, $vars);
+    }
+
+    private function getLicense()
+    {
+        $path = BB_PATH_LICENSE;
+        if (!file_exists($path)) {
+            return 'BoxBilling is licensed under the Apache License, Version 2.0.'.PHP_EOL.'Please visit https://github.com/boxbilling/boxbilling/blob/master/LICENSE for full license text.';
+        }
+        return file_get_contents($path);
+    }
+
+    private function getPdo($host, $db, $user, $pass)
+    {
+        $pdo = new \PDO('mysql:host='.$host,
+            $user,
+            $pass,
+            array(
+                \PDO::MYSQL_ATTR_USE_BUFFERED_QUERY         => true,
+                \PDO::ATTR_ERRMODE                          => \PDO::ERRMODE_EXCEPTION,
+                \PDO::ATTR_DEFAULT_FETCH_MODE               => \PDO::FETCH_ASSOC,
+            )
+        );
+
+        $pdo->exec( 'SET NAMES "utf8"' );
+        $pdo->exec( 'SET CHARACTER SET utf8' );
+        $pdo->exec( 'SET CHARACTER_SET_CONNECTION = utf8' );
+        $pdo->exec( 'SET CHARACTER_SET_DATABASE = utf8' );
+        $pdo->exec( 'SET character_set_results = utf8' );
+        $pdo->exec( 'SET character_set_server = utf8' );
+        $pdo->exec( 'SET SESSION interactive_timeout = 28800' );
+        $pdo->exec( 'SET SESSION wait_timeout = 28800' );
+
+        // try create database if permissions allows
+        try {
+            $pdo->exec("CREATE DATABASE `$db` CHARACTER SET utf8 COLLATE utf8_general_ci;");
+        } catch (PDOException $e) {
+            error_log($e->getMessage());
+        }
+
+        $pdo->query("USE $db;");
+        return $pdo;
+    }
+
+    private function canConnectToDatabase($host, $db, $user, $pass)
+    {
+        try {
+            $this->getPdo($host, $db, $user, $pass);
+        } catch (\Exception $e) {
+            error_log($e->getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    private function isValidAdmin($email, $pass, $name)
+    {
+        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            return false;
+        }
+
+        if (empty($pass)) {
+            return false;
+        }
+
+        if (empty($name)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function makeInstall($ns)
+    {
+        $this->_isValidInstallData($ns);
+        $this->_createConfigurationFile($ns);
+
+        $pdo = $this->getPdo($ns->get('db_host'), $ns->get('db_name'), $ns->get('db_user'), $ns->get('db_pass'));
+
+        $sql = file_get_contents(BB_PATH_SQL);
+        $sql_content = file_get_contents(BB_PATH_SQL_DATA);
+
+        if (!$sql || !$sql_content) {
+            throw new Exception('Could not read structure.sql file');
+        }
+
+        $sql .= $sql_content;
+
+        $sql = preg_split('/\;[\r]*\n/ism', $sql);
+        $sql = array_map('trim', $sql);
+        $err = '';
+        foreach ($sql as $query) {
+            if (!trim($query)) {
+                continue;
+            }
+
+            $res = $pdo->query($query);
+        }
+
+        $passwordObject = new \Box_Password();
+        $stmt = $pdo->prepare("INSERT INTO admin (role, name, email, pass, protected, created_at, updated_at) VALUES('admin', :admin_name, :admin_email, :admin_pass, 1, NOW(), NOW());");
+        $stmt->execute(array(
+            'admin_name'  => $ns->get('admin_name'),
+            'admin_email' => $ns->get('admin_email'),
+            'admin_pass'  => $passwordObject->hashIt($ns->get('admin_pass')),
+        ));
+
+        try {
+            $this->_sendMail($ns);
+        } catch (Exception $e) {
+            // E-mail was not sent, but that is not a problem
+            error_log($e->getMessage());
+        }
+
+        return true;
+    }
+
+    private function _sendMail($ns)
+    {
+        $admin_name = $ns->get('admin_name');
+        $admin_email = $ns->get('admin_email');
+        $admin_pass = $ns->get('admin_pass');
+
+        $content = "Hi $admin_name, " . PHP_EOL;
+        $content .= "You have successfully setup BoxBilling at " . BB_URL . PHP_EOL;
+        $content .= "Access client area at: " . BB_URL . PHP_EOL;
+        $content .= "Access admin area at: " . BB_URL_ADMIN . " with login details:" . PHP_EOL;
+        $content .= "E-mail: " . $admin_email . PHP_EOL;
+        $content .= "Password: " . $admin_pass . PHP_EOL . PHP_EOL;
+
+        $content .= "Read BoxBilling documentation to get started https://docs.boxbilling.com/" . PHP_EOL;
+        $content .= "Thank You for using BoxBilling." . PHP_EOL;
+
+        $subject = sprintf('BoxBilling is ready at "%s"', BB_URL);
+
+        @mail($admin_email, $subject, $content);
+    }
+
+    private function _createConfigurationFile($data)
+    {
+        $output = $this->_getConfigOutput($data);
+        if (!@file_put_contents(BB_PATH_CONFIG, $output)) {
+            throw new Exception('Configuration file is not writable or does not exist. Please create the file at ' . BB_PATH_CONFIG . ' and make it writable', 101);
+        }
+    }
+
+    private function _getConfigOutput($ns)
+    {
+        $data = [
+            'debug' => false,
+            'salt' => md5(uniqid()),
+            'url' => BB_URL,
+            'admin_area_prefix' => '/bb-admin',
+            'sef_urls' => true,
+            'timezone' => 'UTC',
+            'locale' => 'en_US',
+            'locale_date_format' => '%A, %d %B %G',
+            'locale_time_format' => ' %T',
+            'path_data' => BB_PATH_ROOT . '/bb-data',
+            'path_logs' => BB_PATH_ROOT . '/bb-data/log/application.log',
+
+            'log_to_db' => true,
+
+            'db' => [
+                'type' => 'mysql',
+                'host' => $ns->get('db_host'),
+                'name' => $ns->get('db_name'),
+                'user' => $ns->get('db_user'),
+                'password' => $ns->get('db_pass'),
+            ],
+
+            'twig' => [
+                'debug' => true,
+                'auto_reload' => true,
+                'cache' => BB_PATH_ROOT . '/bb-data/cache',
+            ],
+
+            'api' => [
+                'require_referrer_header' => false,
+                'allowed_ips' => [],
+                'rate_span' => 60 * 60,
+                'rate_limit' => 1000,
+            ],
+        ];
+        $output = '<?php ' . PHP_EOL;
+        $output .= 'return ' . var_export($data, true) . ';';
+        return $output;
+    }
+
+    private function _isValidInstallData($ns)
+    {
+        if (!$this->canConnectToDatabase($ns->get('db_host'), $ns->get('db_name'), $ns->get('db_user'), $ns->get('db_pass'))) {
+            throw new Exception('Can not connect to database');
+        }
+
+        if (!$this->isValidAdmin($ns->get('admin_email'), $ns->get('admin_pass'), $ns->get('admin_name'))) {
+            throw new Exception('Administrators account is not valid');
+        }
+    }
+
+    private function generateEmailTemplates()
+    {
+        define('BB_PATH_MODS', BB_PATH_ROOT . '/bb-modules');
+
+        $emailService = new \Box\Mod\Email\Service();
+        $di = $di = include BB_PATH_ROOT . '/bb-di.php';
+        $di['translate']();
+        $emailService->setDi($di);
+        return $emailService->templateBatchGenerate();
+    }
+}
+
+$action = isset($_GET['a']) ? $_GET['a'] : 'index';
+$installer = new Box_Installer;
+$installer->run($action);
diff --git a/src/install/content.sql b/src/install/sql/content.sql
similarity index 100%
rename from src/install/content.sql
rename to src/install/sql/content.sql
diff --git a/src/install/content_test.sql b/src/install/sql/content_test.sql
similarity index 100%
rename from src/install/content_test.sql
rename to src/install/sql/content_test.sql
diff --git a/src/install/structure.sql b/src/install/sql/structure.sql
similarity index 100%
rename from src/install/structure.sql
rename to src/install/sql/structure.sql