diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index f5d7a61f..2f6928ae 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -2,27 +2,31 @@
 
 namespace App\Http\Controllers;
 
-use App\Airport;
-use App\Audit;
-use App\Announcement;
-use App\Bronze;
-use App\Calendar;
-use App\ControllerLog;
-use App\Event;
-use App\EventPosition;
-use App\EventRegistration;
-use App\Feedback;
-use App\File;
-use App\Incident;
-use App\Metar;
-use App\PositionPreset;
-use App\PresetPosition;
-use App\Pyrite;
-use App\Scenery;
-use App\SoloCert;
-use App\User;
-use App\Visitor;
-use App\VisitRej;
+use App\Models\WebData\Airport;
+use App\Models\WebData\Audit;
+use App\Models\WebData\File;
+use App\Models\WebData\Announcement;
+use App\Models\WebData\Bronze;
+use App\Models\WebData\ControllerLog;
+use App\Models\WebData\Pyrite;
+use App\Modles\WebData\Scenery;
+
+use App\Models\Events\Calendar;
+use App\Models\Events\Event;
+use App\Models\Events\EventPosition;
+use App\Models\Events\EventRegistration;
+use App\Models\Events\PositionPreset;
+use App\Models\Events\PresetPosition;
+
+use App\Models\Mship\Feedback;
+use App\Models\Mship\Incident;
+use App\Models\Mship\User;
+use App\Models\Mship\Visitor;
+use App\Models\Mship\VisitRej;
+
+use App\Models\VatsimData\Metar;
+use App\Models\Training\SoloCert;
+
 use Artisan;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
diff --git a/app/Http/Controllers/AdminDash.php b/app/Http/Controllers/AdminDash.php
index 0672f3e3..50bdd100 100644
--- a/app/Http/Controllers/AdminDash.php
+++ b/app/Http/Controllers/AdminDash.php
@@ -2,27 +2,31 @@
 
 namespace App\Http\Controllers;
 
-use App\Airport;
-use App\Audit;
-use App\Announcement;
-use App\Bronze;
-use App\Calendar;
-use App\ControllerLog;
-use App\Event;
-use App\EventPosition;
-use App\EventRegistration;
-use App\Feedback;
-use App\File;
-use App\Incident;
-use App\Metar;
-use App\PositionPreset;
-use App\PresetPosition;
-use App\Pyrite;
-use App\Scenery;
-use App\SoloCert;
-use App\User;
-use App\Visitor;
-use App\VisitRej;
+use App\Models\WebData\Airport;
+use App\Models\WebData\Audit;
+use App\Models\WebData\File;
+use App\Models\WebData\Announcement;
+use App\Models\WebData\Bronze;
+use App\Models\WebData\ControllerLog;
+use App\Models\WebData\Pyrite;
+use App\Modles\WebData\Scenery;
+
+use App\Models\Events\Calendar;
+use App\Models\Events\Event;
+use App\Models\Events\EventPosition;
+use App\Models\Events\EventRegistration;
+use App\Models\Events\PositionPreset;
+use App\Models\Events\PresetPosition;
+
+use App\Models\Mship\Feedback;
+use App\Models\Mship\Incident;
+use App\Models\Mship\User;
+use App\Models\Mship\Visitor;
+use App\Models\Mship\VisitRej;
+
+use App\Models\VatsimData\Metar;
+use App\Models\Training\SoloCert;
+
 use Artisan;
 use Illuminate\Support\Facades\Auth;
 use Carbon\Carbon;
diff --git a/app/Calendar.php b/app/Models/Events/Calendar.php
similarity index 89%
rename from app/Calendar.php
rename to app/Models/Events/Calendar.php
index 7096fc23..fc785a26 100644
--- a/app/Calendar.php
+++ b/app/Models/Events/Calendar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Events;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Event.php b/app/Models/Events/Event.php
similarity index 93%
rename from app/Event.php
rename to app/Models/Events/Event.php
index 16b59a0a..67a21daa 100644
--- a/app/Event.php
+++ b/app/Models/Events/Event.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\Events;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/EventPosition.php b/app/Models/Events/EventPosition.php
similarity index 93%
rename from app/EventPosition.php
rename to app/Models/Events/EventPosition.php
index 613ce4e1..5dfe1ecf 100644
--- a/app/EventPosition.php
+++ b/app/Models/Events/EventPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\Events;
 
 use App\EventRegistration;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/EventRegistration.php b/app/Models/Events/EventRegistration.php
similarity index 89%
rename from app/EventRegistration.php
rename to app/Models/Events/EventRegistration.php
index eba920d0..4b58ab3e 100644
--- a/app/EventRegistration.php
+++ b/app/Models/Events/EventRegistration.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App;
+namespace App\Modles\Events;
 
-use App\EventPosition;
-use App\User;
+use App\Models\Events\EventPosition;
+use App\Models\Mship\User;
 use Illuminate\Database\Eloquent\Model;
 
 class EventRegistration extends Model
diff --git a/app/PositionPreset.php b/app/Models/Events/PositionPreset.php
similarity index 89%
rename from app/PositionPreset.php
rename to app/Models/Events/PositionPreset.php
index 1eb4c1bc..968946ef 100644
--- a/app/PositionPreset.php
+++ b/app/Models/Events/PositionPreset.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Events;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/PresetPosition.php b/app/Models/Events/PresetPosition.php
similarity index 87%
rename from app/PresetPosition.php
rename to app/Models/Events/PresetPosition.php
index 78c2b7c3..699d1d74 100644
--- a/app/PresetPosition.php
+++ b/app/Models/Events/PresetPosition.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Events;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Feedback.php b/app/Models/Mship/Feedback.php
similarity index 95%
rename from app/Feedback.php
rename to app/Models/Mship/Feedback.php
index 725f5ee8..c53724d6 100644
--- a/app/Feedback.php
+++ b/app/Models/Mship/Feedback.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Modles\Mship;
 
-use App\User;
+use App\Modles\Mship\User;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
 use SimpleXMLElement;
diff --git a/app/Incident.php b/app/Models/Mship/Incident.php
similarity index 93%
rename from app/Incident.php
rename to app/Models/Mship/Incident.php
index 0baa5476..6f3708d8 100644
--- a/app/Incident.php
+++ b/app/Models/Mship/Incident.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Modles\Mship;
 
-use App\User;
+use App\Models\Mship\User;
 use Illuminate\Database\Eloquent\Model;
 
 class Incident extends Model
diff --git a/app/Opt.php b/app/Models/Mship/Opt.php
similarity index 88%
rename from app/Opt.php
rename to app/Models/Mship/Opt.php
index 3bcb194d..f714e900 100644
--- a/app/Opt.php
+++ b/app/Models/Mship/Opt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Permission.php b/app/Models/Mship/Permission.php
similarity index 79%
rename from app/Permission.php
rename to app/Models/Mship/Permission.php
index 4f04b24b..a2f1a6d5 100644
--- a/app/Permission.php
+++ b/app/Models/Mship/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Laratrust\Models\LaratrustPermission;
 
diff --git a/app/Role.php b/app/Models/Mship/Role.php
similarity index 76%
rename from app/Role.php
rename to app/Models/Mship/Role.php
index ccfec968..b4f4dc33 100644
--- a/app/Role.php
+++ b/app/Models/Mship/Role.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Laratrust\Models\LaratrustRole;
 
diff --git a/app/Team.php b/app/Models/Mship/Team.php
similarity index 76%
rename from app/Team.php
rename to app/Models/Mship/Team.php
index c22694da..b6f2afb5 100644
--- a/app/Team.php
+++ b/app/Models/Mship/Team.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Laratrust\Models\LaratrustTeam;
 
diff --git a/app/User.php b/app/Models/Mship/User.php
similarity index 98%
rename from app/User.php
rename to app/Models/Mship/User.php
index a562ae0c..44fab3b7 100644
--- a/app/User.php
+++ b/app/Models/Mship/User.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Carbon\Carbon;
-use App\CotrollerLog;
-use App\MoodleEnrol;
-use App\User;
+use App\Models\WebData\CotrollerLog;
+use App\Models\WebData\MoodleEnrol;
+use App\User\Models\Mship;
 use Config;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Auth\User as Authenticatable;
diff --git a/app/VisitRej.php b/app/Models/Mship/VisitRej.php
similarity index 88%
rename from app/VisitRej.php
rename to app/Models/Mship/VisitRej.php
index acf232e7..7e21bf37 100644
--- a/app/VisitRej.php
+++ b/app/Models/Mship/VisitRej.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\Mship;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Visitor.php b/app/Models/Mship/Visitor.php
similarity index 96%
rename from app/Visitor.php
rename to app/Models/Mship/Visitor.php
index fd6edb88..7fa37c31 100644
--- a/app/Visitor.php
+++ b/app/Models/Mship/Visitor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Mship;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Ots.php b/app/Models/Training/Ots.php
similarity index 99%
rename from app/Ots.php
rename to app/Models/Training/Ots.php
index 0ef82750..9a53f682 100644
--- a/app/Ots.php
+++ b/app/Models/Training/Ots.php
@@ -3,7 +3,7 @@
 namespace App;
 
 
-use App\User;
+use App\Models\Mship\User;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
 use SimpleXMLElement;
diff --git a/app/SoloCert.php b/app/Models/Training/SoloCert.php
similarity index 93%
rename from app/SoloCert.php
rename to app/Models/Training/SoloCert.php
index b951fa4e..c0aa212d 100644
--- a/app/SoloCert.php
+++ b/app/Models/Training/SoloCert.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Training;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/TrainingInfo.php b/app/Models/Training/TrainingInfo.php
similarity index 95%
rename from app/TrainingInfo.php
rename to app/Models/Training/TrainingInfo.php
index b5618198..cbed9720 100644
--- a/app/TrainingInfo.php
+++ b/app/Models/Training/TrainingInfo.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\Training;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/TrainingRequest.php b/app/Models/Training/TrainingRequest.php
similarity index 99%
rename from app/TrainingRequest.php
rename to app/Models/Training/TrainingRequest.php
index e1abcb14..ca5c188e 100644
--- a/app/TrainingRequest.php
+++ b/app/Models/Training/TrainingRequest.php
@@ -1,5 +1,5 @@
 <?php
-namespace App;
+namespace App\Models\Training;
 
 use Illuminate\Database\Eloquent\Model;
 use Carbon\Carbon;
diff --git a/app/TrainingTicket.php b/app/Models/Training/TrainingTicket.php
similarity index 99%
rename from app/TrainingTicket.php
rename to app/Models/Training/TrainingTicket.php
index 3d6f8fd5..91195a2f 100644
--- a/app/TrainingTicket.php
+++ b/app/Models/Training/TrainingTicket.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\Training;
 
-use App\User;
+use App\Models\User;
 use Carbon\Carbon;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/ATC.php b/app/Models/VatsimData/ATC.php
similarity index 95%
rename from app/ATC.php
rename to app/Models/VatsimData/ATC.php
index 4d1b5bb2..eac3a7d4 100644
--- a/app/ATC.php
+++ b/app/Models/VatsimData/ATC.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\VatsimData;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Metar.php b/app/Models/VatsimData/Metar.php
similarity index 88%
rename from app/Metar.php
rename to app/Models/VatsimData/Metar.php
index 4cd2e7bb..111f95e1 100644
--- a/app/Metar.php
+++ b/app/Models/VatsimData/Metar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\VatsimData;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Airport.php b/app/Models/WebData/Airport.php
similarity index 97%
rename from app/Airport.php
rename to app/Models/WebData/Airport.php
index 55623a38..fb6f23d5 100644
--- a/app/Airport.php
+++ b/app/Models/WebData/Airport.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use App\deserialization;
-use App\Metar;
+use App\Models\VatsimData\Metar;
 use GuzzleHttp\Client;
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Announcement.php b/app/Models/WebData/Announcement.php
similarity index 95%
rename from app/Announcement.php
rename to app/Models/WebData/Announcement.php
index 0c62d5ab..355c3b5b 100644
--- a/app/Announcement.php
+++ b/app/Models/WebData/Announcement.php
@@ -2,7 +2,7 @@
 
 namespace App;
 
-use App\User;
+use App\Models\Mship\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Audit.php b/app/Models/WebData/Audit.php
similarity index 92%
rename from app/Audit.php
rename to app/Models/WebData/Audit.php
index db5dd88c..20f9a8c2 100644
--- a/app/Audit.php
+++ b/app/Models/WebData/Audit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Modles\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Bronze.php b/app/Models/WebData/Bronze.php
similarity index 86%
rename from app/Bronze.php
rename to app/Models/WebData/Bronze.php
index e55091ac..c44b7a22 100644
--- a/app/Bronze.php
+++ b/app/Models/WebData/Bronze.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
-use App\User;
+use App\Models\Mship\User;
 use Illuminate\Database\Eloquent\Model;
 
 class Bronze extends Model
diff --git a/app/ControllerLog.php b/app/Models/WebData/ControllerLog.php
similarity index 98%
rename from app/ControllerLog.php
rename to app/Models/WebData/ControllerLog.php
index dae6917e..35c87c3c 100644
--- a/app/ControllerLog.php
+++ b/app/Models/WebData/ControllerLog.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
-use App\User;
+use App\Models\Mship\User;
 use DB;
 use Illuminate\Database\Eloquent\Builder as QueryBuilder;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/ControllerLogUpdate.php b/app/Models/WebData/ControllerLogUpdate.php
similarity index 86%
rename from app/ControllerLogUpdate.php
rename to app/Models/WebData/ControllerLogUpdate.php
index b237ceb2..0d7a645b 100644
--- a/app/ControllerLogUpdate.php
+++ b/app/Models/WebData/ControllerLogUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/File.php b/app/Models/WebData/File.php
similarity index 91%
rename from app/File.php
rename to app/Models/WebData/File.php
index c79d6f2b..0e170b60 100644
--- a/app/File.php
+++ b/app/Models/WebData/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
-use App\File;
+use App\Models\WebData\File;
 use Illuminate\Database\Eloquent\Model;
 
 class File extends Model
diff --git a/app/MoodleEnrol.php b/app/Models/WebData/MoodleEnrol.php
similarity index 81%
rename from app/MoodleEnrol.php
rename to app/Models/WebData/MoodleEnrol.php
index bdc5d942..910fd143 100644
--- a/app/MoodleEnrol.php
+++ b/app/Models/WebData/MoodleEnrol.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Pyrite.php b/app/Models/WebData/Pyrite.php
similarity index 92%
rename from app/Pyrite.php
rename to app/Models/WebData/Pyrite.php
index 423f167b..661db790 100644
--- a/app/Pyrite.php
+++ b/app/Models/WebData/Pyrite.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Scenery.php b/app/Models/WebData/Scenery.php
similarity index 87%
rename from app/Scenery.php
rename to app/Models/WebData/Scenery.php
index 176a099f..baf8d00e 100644
--- a/app/Scenery.php
+++ b/app/Models/WebData/Scenery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace App\Models\WebData;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/models/mship.php b/app/models/mship.php
deleted file mode 100644
index e69de29b..00000000