diff --git a/application/.htaccess b/app/.htaccess
similarity index 100%
rename from application/.htaccess
rename to app/.htaccess
diff --git a/application/Config/App.php b/app/Config/App.php
similarity index 100%
rename from application/Config/App.php
rename to app/Config/App.php
diff --git a/application/Config/Autoload.php b/app/Config/Autoload.php
similarity index 100%
rename from application/Config/Autoload.php
rename to app/Config/Autoload.php
diff --git a/application/Config/Boot/development.php b/app/Config/Boot/development.php
similarity index 100%
rename from application/Config/Boot/development.php
rename to app/Config/Boot/development.php
diff --git a/application/Config/Boot/production.php b/app/Config/Boot/production.php
similarity index 100%
rename from application/Config/Boot/production.php
rename to app/Config/Boot/production.php
diff --git a/application/Config/Boot/testing.php b/app/Config/Boot/testing.php
similarity index 100%
rename from application/Config/Boot/testing.php
rename to app/Config/Boot/testing.php
diff --git a/application/Config/Cache.php b/app/Config/Cache.php
similarity index 100%
rename from application/Config/Cache.php
rename to app/Config/Cache.php
diff --git a/application/Config/Constants.php b/app/Config/Constants.php
similarity index 100%
rename from application/Config/Constants.php
rename to app/Config/Constants.php
diff --git a/application/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
similarity index 100%
rename from application/Config/ContentSecurityPolicy.php
rename to app/Config/ContentSecurityPolicy.php
diff --git a/application/Config/Database.php b/app/Config/Database.php
similarity index 100%
rename from application/Config/Database.php
rename to app/Config/Database.php
diff --git a/application/Config/DocTypes.php b/app/Config/DocTypes.php
similarity index 100%
rename from application/Config/DocTypes.php
rename to app/Config/DocTypes.php
diff --git a/application/Config/Email.php b/app/Config/Email.php
similarity index 100%
rename from application/Config/Email.php
rename to app/Config/Email.php
diff --git a/application/Config/Events.php b/app/Config/Events.php
similarity index 100%
rename from application/Config/Events.php
rename to app/Config/Events.php
diff --git a/application/Config/Exceptions.php b/app/Config/Exceptions.php
similarity index 100%
rename from application/Config/Exceptions.php
rename to app/Config/Exceptions.php
diff --git a/application/Config/Filters.php b/app/Config/Filters.php
similarity index 100%
rename from application/Config/Filters.php
rename to app/Config/Filters.php
diff --git a/application/Config/ForeignCharacters.php b/app/Config/ForeignCharacters.php
similarity index 100%
rename from application/Config/ForeignCharacters.php
rename to app/Config/ForeignCharacters.php
diff --git a/application/Config/Format.php b/app/Config/Format.php
similarity index 100%
rename from application/Config/Format.php
rename to app/Config/Format.php
diff --git a/application/Config/Honeypot.php b/app/Config/Honeypot.php
similarity index 100%
rename from application/Config/Honeypot.php
rename to app/Config/Honeypot.php
diff --git a/application/Config/Images.php b/app/Config/Images.php
similarity index 100%
rename from application/Config/Images.php
rename to app/Config/Images.php
diff --git a/application/Config/Logger.php b/app/Config/Logger.php
similarity index 100%
rename from application/Config/Logger.php
rename to app/Config/Logger.php
diff --git a/application/Config/Migrations.php b/app/Config/Migrations.php
similarity index 100%
rename from application/Config/Migrations.php
rename to app/Config/Migrations.php
diff --git a/application/Config/Mimes.php b/app/Config/Mimes.php
similarity index 100%
rename from application/Config/Mimes.php
rename to app/Config/Mimes.php
diff --git a/application/Config/Modules.php b/app/Config/Modules.php
similarity index 100%
rename from application/Config/Modules.php
rename to app/Config/Modules.php
diff --git a/application/Config/Pager.php b/app/Config/Pager.php
similarity index 100%
rename from application/Config/Pager.php
rename to app/Config/Pager.php
diff --git a/application/Config/Paths.php b/app/Config/Paths.php
similarity index 100%
rename from application/Config/Paths.php
rename to app/Config/Paths.php
diff --git a/application/Config/Routes.php b/app/Config/Routes.php
similarity index 100%
rename from application/Config/Routes.php
rename to app/Config/Routes.php
diff --git a/application/Config/Services.php b/app/Config/Services.php
similarity index 100%
rename from application/Config/Services.php
rename to app/Config/Services.php
diff --git a/application/Config/Toolbar.php b/app/Config/Toolbar.php
similarity index 100%
rename from application/Config/Toolbar.php
rename to app/Config/Toolbar.php
diff --git a/application/Config/UserAgents.php b/app/Config/UserAgents.php
similarity index 100%
rename from application/Config/UserAgents.php
rename to app/Config/UserAgents.php
diff --git a/application/Config/Validation.php b/app/Config/Validation.php
similarity index 100%
rename from application/Config/Validation.php
rename to app/Config/Validation.php
diff --git a/application/Config/View.php b/app/Config/View.php
similarity index 100%
rename from application/Config/View.php
rename to app/Config/View.php
diff --git a/application/Controllers/Home.php b/app/Controllers/Home.php
similarity index 100%
rename from application/Controllers/Home.php
rename to app/Controllers/Home.php
diff --git a/application/Database/Migrations/.gitkeep b/app/Database/Migrations/.gitkeep
similarity index 100%
rename from application/Database/Migrations/.gitkeep
rename to app/Database/Migrations/.gitkeep
diff --git a/application/Database/Seeds/.gitkeep b/app/Database/Seeds/.gitkeep
similarity index 100%
rename from application/Database/Seeds/.gitkeep
rename to app/Database/Seeds/.gitkeep
diff --git a/application/Filters/.gitkeep b/app/Filters/.gitkeep
similarity index 100%
rename from application/Filters/.gitkeep
rename to app/Filters/.gitkeep
diff --git a/application/Filters/CSRF.php b/app/Filters/CSRF.php
similarity index 100%
rename from application/Filters/CSRF.php
rename to app/Filters/CSRF.php
diff --git a/application/Filters/DebugToolbar.php b/app/Filters/DebugToolbar.php
similarity index 100%
rename from application/Filters/DebugToolbar.php
rename to app/Filters/DebugToolbar.php
diff --git a/application/Filters/Honeypot.php b/app/Filters/Honeypot.php
similarity index 100%
rename from application/Filters/Honeypot.php
rename to app/Filters/Honeypot.php
diff --git a/application/Filters/Throttle.php b/app/Filters/Throttle.php
similarity index 100%
rename from application/Filters/Throttle.php
rename to app/Filters/Throttle.php
diff --git a/application/Helpers/.gitkeep b/app/Helpers/.gitkeep
similarity index 100%
rename from application/Helpers/.gitkeep
rename to app/Helpers/.gitkeep
diff --git a/application/Language/.gitkeep b/app/Language/.gitkeep
similarity index 100%
rename from application/Language/.gitkeep
rename to app/Language/.gitkeep
diff --git a/application/Libraries/.gitkeep b/app/Libraries/.gitkeep
similarity index 100%
rename from application/Libraries/.gitkeep
rename to app/Libraries/.gitkeep
diff --git a/application/Models/.gitkeep b/app/Models/.gitkeep
similarity index 100%
rename from application/Models/.gitkeep
rename to app/Models/.gitkeep
diff --git a/application/ThirdParty/.gitkeep b/app/ThirdParty/.gitkeep
similarity index 100%
rename from application/ThirdParty/.gitkeep
rename to app/ThirdParty/.gitkeep
diff --git a/application/Views/errors/cli/error_404.php b/app/Views/errors/cli/error_404.php
similarity index 100%
rename from application/Views/errors/cli/error_404.php
rename to app/Views/errors/cli/error_404.php
diff --git a/application/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
similarity index 79%
rename from application/Views/errors/cli/error_exception.php
rename to app/Views/errors/cli/error_exception.php
index 0c0c486a63..f8f2d95177 100644
--- a/application/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -5,12 +5,12 @@ Message:     <?= $message, "\n"; ?>
 Filename:    <?= $exception->getFile(), "\n"; ?>
 Line Number: <?= $exception->getLine(); ?>
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?>
+<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
 
 	Backtrace:
 	<?php foreach ($exception->getTrace() as $error): ?>
 		<?php if (isset($error['file'])): ?>
-<?= trim('-'. $error['line'] .' - '. $error['file'] .'::'. $error['function']) ."\n" ?>
+			<?= trim('-' . $error['line'] . ' - ' . $error['file'] . '::' . $error['function']) . "\n" ?>
 		<?php endif ?>
 	<?php endforeach ?>
 
diff --git a/application/Views/errors/cli/production.php b/app/Views/errors/cli/production.php
similarity index 69%
rename from application/Views/errors/cli/production.php
rename to app/Views/errors/cli/production.php
index f04d517d21..7db744ecea 100644
--- a/application/Views/errors/cli/production.php
+++ b/app/Views/errors/cli/production.php
@@ -2,4 +2,4 @@
 
 // On the CLI, we still want errors in productions
 // so just use the exception template.
-include __DIR__.'/error_exception.php';
+include __DIR__ . '/error_exception.php';
diff --git a/application/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
similarity index 100%
rename from application/Views/errors/html/debug.css
rename to app/Views/errors/html/debug.css
diff --git a/application/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
similarity index 100%
rename from application/Views/errors/html/debug.js
rename to app/Views/errors/html/debug.js
diff --git a/application/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
similarity index 95%
rename from application/Views/errors/html/error_404.php
rename to app/Views/errors/html/error_404.php
index c4b489d9dc..0aa747b066 100644
--- a/application/Views/errors/html/error_404.php
+++ b/app/Views/errors/html/error_404.php
@@ -73,7 +73,7 @@
 		<h1>404 - File Not Found</h1>
 
 		<p>
-			<?php if (! empty($message) && $message != '(null)') : ?>
+			<?php if (! empty($message) && $message !== '(null)') : ?>
 				<?= esc($message) ?>
 			<?php else : ?>
 				Sorry! Cannot seem to find the page you were looking for.
diff --git a/application/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
similarity index 86%
rename from application/Views/errors/html/error_exception.php
rename to app/Views/errors/html/error_exception.php
index 476f40f702..7052e53b95 100644
--- a/application/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -7,11 +7,11 @@
 
 	<title><?= htmlspecialchars($title, ENT_SUBSTITUTE, 'UTF-8') ?></title>
 	<style type="text/css">
-		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'debug.css')) ?>
+		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
 	</style>
 
 	<script type="text/javascript">
-		<?= file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'debug.js') ?>
+		<?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
 	</script>
 </head>
 <body onload="init()">
@@ -19,10 +19,10 @@
 	<!-- Header -->
 	<div class="header">
 		<div class="container">
-			<h1><?= htmlspecialchars($title, ENT_SUBSTITUTE, 'UTF-8'), ($exception->getCode() ? ' #'.$exception->getCode() : '') ?></h1>
+			<h1><?= htmlspecialchars($title, ENT_SUBSTITUTE, 'UTF-8'), ($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
 			<p>
 				<?= $exception->getMessage() ?>
-				<a href="https://www.google.com/search?q=<?= urlencode($title.' '.preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
+				<a href="https://www.google.com/search?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
 				   rel="noreferrer" target="_blank">search &rarr;</a>
 			</p>
 		</div>
@@ -64,14 +64,14 @@
 							<!-- Trace info -->
 							<?php if (isset($row['file']) && is_file($row['file'])) :?>
 								<?php
-									if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once']))
+								if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once']))
 									{
-										echo $row['function'].' '. static::cleanPath($row['file']);
-									}
-									else
+									echo $row['function'] . ' ' . static::cleanPath($row['file']);
+								}
+								else
 									{
-										echo static::cleanPath($row['file']).' : '.$row['line'];
-									}
+									echo static::cleanPath($row['file']) . ' : ' . $row['line'];
+								}
 								?>
 							<?php else : ?>
 								{PHP internal code}
@@ -79,9 +79,9 @@
 
 							<!-- Class/Method -->
 							<?php if (isset($row['class'])) : ?>
-								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= $row['class'].$row['type'].$row['function'] ?>
+								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= $row['class'] . $row['type'] . $row['function'] ?>
 								<?php if (! empty($row['args'])) : ?>
-									<?php $args_id = $error_id.'args'.$index ?>
+									<?php $args_id = $error_id . 'args' . $index ?>
 									( <a href="#" onclick="return toggle('<?= $args_id ?>');">arguments</a> )
 									<div class="args" id="<?= $args_id ?>">
 										<table cellspacing="0">
@@ -89,14 +89,14 @@
 										<?php
 										$params = null;
 										// Reflection by name is not available for closure function
-										if( substr( $row['function'], -1 ) !== '}' )
+										if (substr( $row['function'], -1 ) !== '}')
 										{
 											$mirror = isset( $row['class'] ) ? new \ReflectionMethod( $row['class'], $row['function'] ) : new \ReflectionFunction( $row['function'] );
 											$params = $mirror->getParameters();
 										}
 										foreach ($row['args'] as $key => $value) : ?>
 											<tr>
-												<td><code><?= htmlspecialchars(isset($params[$key]) ? '$'.$params[$key]->name : "#$key", ENT_SUBSTITUTE, 'UTF-8') ?></code></td>
+												<td><code><?= htmlspecialchars(isset($params[$key]) ? '$' . $params[$key]->name : "#$key", ENT_SUBSTITUTE, 'UTF-8') ?></code></td>
 												<td><pre><?= print_r($value, true) ?></pre></td>
 											</tr>
 										<?php endforeach ?>
@@ -129,7 +129,10 @@
 			<!-- Server -->
 			<div class="content" id="server">
 				<?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
-					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) continue; ?>
+					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
+					{
+						continue;
+} ?>
 
 					<h3>$<?= $var ?></h3>
 
@@ -148,7 +151,7 @@
 									<?php if (is_string($value)) : ?>
 										<?= htmlspecialchars($value, ENT_SUBSTITUTE, 'UTF-8') ?>
 									<?php else: ?>
-										<?= '<pre>'.print_r($value, true) ?>
+										<?= '<pre>' . print_r($value, true) ?>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -175,10 +178,10 @@
 							<tr>
 								<td><?= htmlspecialchars($key, ENT_IGNORE, 'UTF-8') ?></td>
 								<td>
-									<?php if (!is_array($value) && ! is_object($value)) : ?>
+									<?php if (! is_array($value) && ! is_object($value)) : ?>
 										<?= htmlspecialchars($value, ENT_SUBSTITUTE, 'UTF-8') ?>
 									<?php else: ?>
-										<?= '<pre>'.print_r($value, true) ?>
+										<?= '<pre>' . print_r($value, true) ?>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -229,7 +232,10 @@
 
 				<?php $empty = true; ?>
 				<?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
-					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) continue; ?>
+					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
+					{
+						continue;
+} ?>
 
 					<?php $empty = false; ?>
 
@@ -247,10 +253,10 @@
 							<tr>
 								<td><?= htmlspecialchars($key, ENT_IGNORE, 'UTF-8') ?></td>
 								<td>
-									<?php if (!is_array($value) && ! is_object($value)) : ?>
+									<?php if (! is_array($value) && ! is_object($value)) : ?>
 										<?= htmlspecialchars($value, ENT_SUBSTITUTE, 'UTF-8') ?>
 									<?php else: ?>
-										<?= '<pre>'.print_r($value, true) ?>
+										<?= '<pre>' . print_r($value, true) ?>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -282,8 +288,14 @@
 						</thead>
 						<tbody>
 						<?php foreach ($headers as $name => $value) : ?>
-							<?php if (empty($value)) continue; ?>
-							<?php if (! is_array($value)) { $value = [$value]; } ?>
+							<?php if (empty($value))
+							{
+								continue;
+} ?>
+							<?php if (! is_array($value))
+							{
+								$value = [$value];
+} ?>
 							<?php foreach ($value as $h) : ?>
 								<tr>
 									<td><?= esc($h->getName(), 'html') ?></td>
@@ -306,7 +318,7 @@
 				<table>
 					<tr>
 						<td style="width: 15em">Response Status</td>
-						<td><?= $response->getStatusCode().' - '.$response->getReason() ?></td>
+						<td><?= $response->getStatusCode() . ' - ' . $response->getReason() ?></td>
 					</tr>
 				</table>
 
diff --git a/application/Views/errors/html/production.php b/app/Views/errors/html/production.php
similarity index 90%
rename from application/Views/errors/html/production.php
rename to app/Views/errors/html/production.php
index b912a0152c..cca49c2ed9 100644
--- a/application/Views/errors/html/production.php
+++ b/app/Views/errors/html/production.php
@@ -7,7 +7,7 @@
 	<title>Whoops!</title>
 
 	<style type="text/css">
-		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__.DIRECTORY_SEPARATOR.'debug.css')) ?>
+		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
 	</style>
 </head>
 <body>
diff --git a/application/Views/welcome_message.php b/app/Views/welcome_message.php
similarity index 100%
rename from application/Views/welcome_message.php
rename to app/Views/welcome_message.php
diff --git a/application/index.html b/app/index.html
similarity index 100%
rename from application/index.html
rename to app/index.html