diff --git a/.gitmodules b/.gitmodules
index be1e8e4..4abe21d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "system/core"]
-	path = system/core
+[submodule "flarum/core"]
+	path = flarum/core
 	url = https://github.com/flarum/core.git
diff --git a/admin.php b/admin.php
index 56775d6..89c979d 100644
--- a/admin.php
+++ b/admin.php
@@ -7,7 +7,7 @@ use Zend\Diactoros\Server;
 use Zend\Stratigility\MiddlewarePipe;
 
 // Instantiate the application, register providers etc.
-$app = require __DIR__.'/system/bootstrap.php';
+$app = require __DIR__.'/flarum/bootstrap.php';
 
 // Set up everything we need for the frontend
 $app->register('Flarum\Admin\AdminServiceProvider');
diff --git a/api.php b/api.php
index e671c10..537b17f 100644
--- a/api.php
+++ b/api.php
@@ -7,7 +7,7 @@ use Zend\Diactoros\Server;
 use Zend\Stratigility\MiddlewarePipe;
 
 // Instantiate the application, register providers etc.
-$app = require __DIR__.'/system/bootstrap.php';
+$app = require __DIR__.'/flarum/bootstrap.php';
 
 // Set up everything we need for the API
 $app->register('Flarum\Api\ApiServiceProvider');
diff --git a/system/.gitignore b/flarum/.gitignore
similarity index 100%
rename from system/.gitignore
rename to flarum/.gitignore
diff --git a/system/bootstrap.php b/flarum/bootstrap.php
similarity index 95%
rename from system/bootstrap.php
rename to flarum/bootstrap.php
index 3e5e471..64b14ae 100644
--- a/system/bootstrap.php
+++ b/flarum/bootstrap.php
@@ -28,12 +28,12 @@ $app->instance('config', $config = new \Illuminate\Config\Repository([
 	],
 	'mail' => [
 		'driver' => 'smtp',
-		'host' => 'smtp.mailgun.org',
-		'port' => 587,
-		'from' => ['address' => 'noreply@localhost', 'name' => 'Flarum Demo Forum'],
+		'host' => 'mailtrap.io',
+		'port' => 25,
+		'from' => ['address' => 'noreply@flarum.org', 'name' => 'Flarum Demo Forum'],
 		'encryption' => 'tls',
-		'username' => null,
-		'password' => null,
+		'username' => '3041435124c4c166c',
+		'password' => 'a6949720835285',
 		'sendmail' => '/usr/sbin/sendmail -bs',
 		'pretend' => false,
 	],
diff --git a/system/composer.json b/flarum/composer.json
similarity index 82%
rename from system/composer.json
rename to flarum/composer.json
index b009478..50e5694 100644
--- a/system/composer.json
+++ b/flarum/composer.json
@@ -7,7 +7,8 @@
 	"require": {
 		"laravel/framework": "5.1.*",
 		"zendframework/zend-stratigility": "^1.1",
-		"franzl/whoops-middleware": "dev-master"
+		"franzl/whoops-middleware": "dev-master",
+    "flarum/core": "0.1.x@dev"
 	},
 	"require-dev": {
 		"franzl/studio": "1.0.x@dev"
diff --git a/system/composer.lock b/flarum/composer.lock
similarity index 100%
rename from system/composer.lock
rename to flarum/composer.lock
diff --git a/system/error/404.html b/flarum/error/404.html
similarity index 100%
rename from system/error/404.html
rename to flarum/error/404.html
diff --git a/system/error/500.html b/flarum/error/500.html
similarity index 100%
rename from system/error/500.html
rename to flarum/error/500.html
diff --git a/system/flarum b/flarum/flarum
similarity index 100%
rename from system/flarum
rename to flarum/flarum
diff --git a/system/storage/.gitignore b/flarum/storage/.gitignore
similarity index 100%
rename from system/storage/.gitignore
rename to flarum/storage/.gitignore
diff --git a/system/storage/app/.gitignore b/flarum/storage/app/.gitignore
similarity index 100%
rename from system/storage/app/.gitignore
rename to flarum/storage/app/.gitignore
diff --git a/system/storage/framework/.gitignore b/flarum/storage/framework/.gitignore
similarity index 100%
rename from system/storage/framework/.gitignore
rename to flarum/storage/framework/.gitignore
diff --git a/system/storage/framework/cache/.gitignore b/flarum/storage/framework/cache/.gitignore
similarity index 100%
rename from system/storage/framework/cache/.gitignore
rename to flarum/storage/framework/cache/.gitignore
diff --git a/system/storage/framework/sessions/.gitignore b/flarum/storage/framework/sessions/.gitignore
similarity index 100%
rename from system/storage/framework/sessions/.gitignore
rename to flarum/storage/framework/sessions/.gitignore
diff --git a/system/storage/framework/views/.gitignore b/flarum/storage/framework/views/.gitignore
similarity index 100%
rename from system/storage/framework/views/.gitignore
rename to flarum/storage/framework/views/.gitignore
diff --git a/system/storage/less/.gitignore b/flarum/storage/less/.gitignore
similarity index 100%
rename from system/storage/less/.gitignore
rename to flarum/storage/less/.gitignore
diff --git a/system/storage/logs/.gitignore b/flarum/storage/logs/.gitignore
similarity index 100%
rename from system/storage/logs/.gitignore
rename to flarum/storage/logs/.gitignore
diff --git a/system/studio.json b/flarum/studio.json
similarity index 100%
rename from system/studio.json
rename to flarum/studio.json
diff --git a/system/vagrant/aliases b/flarum/vagrant/aliases
similarity index 100%
rename from system/vagrant/aliases
rename to flarum/vagrant/aliases
diff --git a/system/vagrant/environment.sh b/flarum/vagrant/environment.sh
similarity index 100%
rename from system/vagrant/environment.sh
rename to flarum/vagrant/environment.sh
diff --git a/system/.env.example b/system/.env.example
deleted file mode 100644
index 240fe06..0000000
--- a/system/.env.example
+++ /dev/null
@@ -1,17 +0,0 @@
-APP_ENV=local
-APP_DEBUG=true
-APP_KEY=SomeRandomString
-
-DB_HOST=localhost
-DB_DATABASE=flarum
-DB_USERNAME=root
-DB_PASSWORD=root
-
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
diff --git a/system/core b/system/core
deleted file mode 160000
index 0cb3378..0000000
--- a/system/core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0cb3378658b4a6ff3b4a8d5a06378ae8b6c5b87a