diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 6ac527106..e6d0f687a 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Socialite;
 use Auth;
-use App\User;
+use App\Models\User;
 
 use Seat\Eseye\Cache\NullCache;
 use Seat\Eseye\Configuration;
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index b85fe8193..90c830ddb 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
+use App\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php
index d29371565..abbd92b6a 100644
--- a/app/Http/Controllers/MoonsController.php
+++ b/app/Http/Controllers/MoonsController.php
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
+use DB;
 use Illuminate\Http\Request;
-use App\Moon;
+use App\Models\Moon;
 use Seat\Eseye\Cache\NullCache;
 use Seat\Eseye\Configuration;
 use Seat\Eseye\Containers\EsiAuthentication;
 use Seat\Eseye\Eseye;
-use DB;
 use App\Library\MoonCalc;
 
 class MoonsController extends Controller
@@ -73,6 +73,8 @@ class MoonsController extends Controller
         $moon = new Moon;
         $moon->Region = $request->input('region');
         $moon->System = $request->input('system');
+        $moon->Planet = $request->input('planet');
+        $moon->Moon = $request->input('moon');
         $moon->StructureName = $request->input('structure');
         $moon->FirstOre = $request->input('firstore');
         $moon->FirstQuantity = $request->input('firstquan');
@@ -93,15 +95,17 @@ class MoonsController extends Controller
 
     public function storeUpdateMoon(Request $request) {
         $this->validate($request, [
-            'name' => 'required',
+            'system' => 'required',
+            'planet' => 'required',
+            'moon' => 'required',
             'renter' => 'required',
             'date' => 'required'
         ]);
 
         $date = strtotime($request->date . '00:00:01');
-
-        DB::table('moons')
-            ->where('StructureName', $request->name)
+        //Update the database entry
+        DB::table('Moons')
+            ->whereColumn(['System', '=', $request->system], ['Planet', '=', $request->planet], ['Moon', '=', $request->moon])
             ->update([
                 'RentalCorp' => $request->renter,
                 'RentalEnd' => $date,
diff --git a/app/Http/Controllers/WikiController.php b/app/Http/Controllers/WikiController.php
new file mode 100644
index 000000000..d5c2cdbf3
--- /dev/null
+++ b/app/Http/Controllers/WikiController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use DB;
+
+class WikiController extends Controller
+{
+    public function displayRegister() {
+        return view('wiki.register');
+    }
+
+    public function storeRegister(Request $request) {
+        $this->validate($request, [
+            'password' => 'required',
+            'password2' => 'required',
+        ]);
+
+        //Add the new user to the wiki
+        
+    }
+}
diff --git a/app/Library/MoonCalc.php b/app/Library/MoonCalc.php
index 01ced2d6e..9fd4eb884 100644
--- a/app/Library/MoonCalc.php
+++ b/app/Library/MoonCalc.php
@@ -12,10 +12,10 @@ use Session;
 use DB;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
-use App\Config;
-use App\Moon;
-use App\Price;
-use App\ItemComposition;
+use App\Models\Config;
+use App\Models\Moon;
+use App\Models\Price;
+use App\Models\ItemComposition;
 
 class MoonCalc {
 
diff --git a/app/Config.php b/app/Models/Config.php
similarity index 100%
rename from app/Config.php
rename to app/Models/Config.php
diff --git a/app/ItemComposition.php b/app/Models/ItemComposition.php
similarity index 100%
rename from app/ItemComposition.php
rename to app/Models/ItemComposition.php
diff --git a/app/Moon.php b/app/Models/Moon.php
similarity index 100%
rename from app/Moon.php
rename to app/Models/Moon.php
diff --git a/app/OrePrice.php b/app/Models/OrePrice.php
similarity index 100%
rename from app/OrePrice.php
rename to app/Models/OrePrice.php
diff --git a/app/Price.php b/app/Models/Price.php
similarity index 100%
rename from app/Price.php
rename to app/Models/Price.php
diff --git a/app/Models/User.php b/app/Models/User.php
new file mode 100644
index 000000000..35e12c6b7
--- /dev/null
+++ b/app/Models/User.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App;
+
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+
+class User extends Authenticatable
+{
+    use Notifiable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name', 'email', 'avatar', 'owner_hash', 'character_id', 'expires_in', 'access_token', 'refresh_token', 'user_type',
+    ];
+
+    protected $table = 'users';
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+
+    protected $guarded = [];
+}
diff --git a/resources/views/moons/addmoon.blade.php b/resources/views/moons/addmoon.blade.php
index b4ee4154b..338645ac0 100644
--- a/resources/views/moons/addmoon.blade.php
+++ b/resources/views/moons/addmoon.blade.php
@@ -9,6 +9,10 @@
             {{ Form::text('region', '', ['class' => 'form-control', 'placeholder' => 'Region']) }}
             {{ Form::label('system', 'System') }}
             {{ Form::text('system', '', ['class' => 'form-control', 'placeholder' => 'System']) }}
+            {{ Form::label('planet', 'Planet') }}
+            {{ Form::text('planet', '', ['class' => 'form-control', 'placeholder' => 'Planet']) }}
+            {{ Form::label('moon', 'Moon') }}
+            {{ Form::text('moon', '', ['class' => 'form-control', 'placeholder' => 'Moon']) }}
             {{ Form::label('struture', 'Structure Name') }}
             {{ Form::text('structure', '', ['class' => 'form-control', 'placeholder' => 'Structure Name']) }}
             {{ Form::label('firstore', 'First Ore') }}
diff --git a/resources/views/moons/updatemoon.blade.php b/resources/views/moons/updatemoon.blade.php
index 522e69b8a..ea48258df 100644
--- a/resources/views/moons/updatemoon.blade.php
+++ b/resources/views/moons/updatemoon.blade.php
@@ -5,14 +5,18 @@
     <h2>Update Existing Moon</h2>
     {!! Form::open(['action' => 'MoonsController@storeUpdateMoon', 'method' => 'POST']) !!}
     <div class="form-group col-md-6">
-        {{ Form::label('name', 'Structure Name') }}
-        {{ Form::text('name', '', ['class' => 'form-control', 'placeholder' => 'Name']) }}
+        {{ Form::label('system', 'System') }}
+        {{ Form::text('system', '', ['class' => 'form-control', 'placeholder' => 'Planet']) }}
+        {{ Form::label('planet', 'Planet') }}
+        {{ Form::text('planet', '', ['class' => 'form-control', 'placeholder' => 'Planet']) }}
+        {{ Form::label('moon', 'Moon') }}
+        {{ Form::text('moon', '', ['class' => 'form-control', 'placeholder' => 'Planet']) }}
         {{ Form::label('renter', 'Renter') }}
         {{ Form::text('renter', '', ['class' => 'form-control', 'placeholder' => 'Renter']) }}
         {{ Form::label('date', 'Rental End Date') }}
         {{ Form::text('date', '', ['class' => 'form-control', 'placeholder' => '01/01/1970'] )}}
     </div>
-    {{ Form:;submit('Submit', ['class' => 'btn btn-primary']) }}
+    {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }}
     {!! Form::close() !!}
 </div>
 @endsection
\ No newline at end of file
diff --git a/resources/views/wiki/register.blade.php b/resources/views/wiki/register.blade.php
new file mode 100644
index 000000000..a91499c70
--- /dev/null
+++ b/resources/views/wiki/register.blade.php
@@ -0,0 +1,16 @@
+@extends('layouts.b4')
+@include('layouts.navbar')
+@section('content')
+<div class="container">
+    <h2>Register for Warped Intentions Wiki<h2>
+        {!! Form::open(['action' => 'WikiController@storeRegister', 'method' => 'POST']) !!}
+        <div class="form-group col-md-6">
+            {{ Form::label('password', 'Password') }}
+            {{ Form::password('password', '', ['class' => 'form-control']) }}
+            {{ Form::label('password2', 'Repeat Password') }}
+            {{ Form::password('password2', '', ['class' => 'form-control']) }}
+        </div>
+        {{ Form::submit('Submit', ['class' => 'btn btn-primary']) }}
+        {!! Form::close() !!}
+</div>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 76a6446be..2de987f8d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -27,5 +27,11 @@ Route::get('/dashboard', 'DashboardController@index');
 Route::get('/moons/display', 'MoonsController@displayMoons');
 Route::get('/moons/addmoon', 'MoonsController@addMoon');
 Route::get('/moons/updatemoon', 'MoonsController@updateMoon');
-//Moon Controller POSTS requests
-Route::post('moons', 'MoonsController@addMoon');
+//Moon Controller POST requests
+Route::post('storeMoon', 'MoonsController@addMoon');
+Route::post('storeUpdateMoon', 'MoonsController@storeUpdateMoon');
+
+//Wiki Controller display pages
+Route::get('/wiki/register', 'WikiController@displayRegister');
+//Wiki Controller POST requests
+Route::post('storeRegister', 'WikiController@storeRegister');