diff --git a/app/Album.php b/app/Album.php
index 223d74ec..5d9fcb38 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Exception;
 use Illuminate\Database\Eloquent\Model;
@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\URL;
-use App\Traits\SlugTrait;
+use Poniverse\Ponyfm\Traits\SlugTrait;
 use Helpers;
 
 class Album extends Model
@@ -40,32 +40,32 @@ class Album extends Model
 
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Poniverse\Ponyfm\User');
     }
 
     public function users()
     {
-        return $this->hasMany('App\ResourceUser');
+        return $this->hasMany('Poniverse\Ponyfm\ResourceUser');
     }
 
     public function favourites()
     {
-        return $this->hasMany('App\Favourite');
+        return $this->hasMany('Poniverse\Ponyfm\Favourite');
     }
 
     public function cover()
     {
-        return $this->belongsTo('App\Image');
+        return $this->belongsTo('Poniverse\Ponyfm\Image');
     }
 
     public function tracks()
     {
-        return $this->hasMany('App\Track')->orderBy('track_number', 'asc');
+        return $this->hasMany('Poniverse\Ponyfm\Track')->orderBy('track_number', 'asc');
     }
 
     public function comments()
     {
-        return $this->hasMany('App\Comment')->orderBy('created_at', 'desc');
+        return $this->hasMany('Poniverse\Ponyfm\Comment')->orderBy('created_at', 'desc');
     }
 
     public static function mapPublicAlbumShow($album)
diff --git a/app/AlbumDownloader.php b/app/AlbumDownloader.php
index 384e9d64..661de692 100644
--- a/app/AlbumDownloader.php
+++ b/app/AlbumDownloader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use ZipStream;
 
diff --git a/app/Commands/AddTrackToPlaylistCommand.php b/app/Commands/AddTrackToPlaylistCommand.php
index cd514001..301933a5 100644
--- a/app/Commands/AddTrackToPlaylistCommand.php
+++ b/app/Commands/AddTrackToPlaylistCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Playlist;
-use App\Track;
+use Poniverse\Ponyfm\Playlist;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Commands/CommandBase.php b/app/Commands/CommandBase.php
index 850f571e..0e6ab3bc 100644
--- a/app/Commands/CommandBase.php
+++ b/app/Commands/CommandBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
 abstract class CommandBase
 {
diff --git a/app/Commands/CommandResponse.php b/app/Commands/CommandResponse.php
index b1616e74..06c7ae0c 100644
--- a/app/Commands/CommandResponse.php
+++ b/app/Commands/CommandResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
 use Illuminate\Validation\Validator;
 
diff --git a/app/Commands/CreateAlbumCommand.php b/app/Commands/CreateAlbumCommand.php
index 244fb686..446c3ea4 100644
--- a/app/Commands/CreateAlbumCommand.php
+++ b/app/Commands/CreateAlbumCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Album;
-use App\Image;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Image;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
diff --git a/app/Commands/CreateCommentCommand.php b/app/Commands/CreateCommentCommand.php
index 8f7e6c7d..54c215f0 100644
--- a/app/Commands/CreateCommentCommand.php
+++ b/app/Commands/CreateCommentCommand.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Album;
-use App\Comment;
-use App\Playlist;
-use App\Track;
-use App\User;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Comment;
+use Poniverse\Ponyfm\Playlist;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
diff --git a/app/Commands/CreatePlaylistCommand.php b/app/Commands/CreatePlaylistCommand.php
index 267420bf..a8b26a89 100644
--- a/app/Commands/CreatePlaylistCommand.php
+++ b/app/Commands/CreatePlaylistCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Playlist;
+use Poniverse\Ponyfm\Playlist;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
diff --git a/app/Commands/DeleteAlbumCommand.php b/app/Commands/DeleteAlbumCommand.php
index 79ee865f..f147ac2a 100644
--- a/app/Commands/DeleteAlbumCommand.php
+++ b/app/Commands/DeleteAlbumCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Album;
+use Poniverse\Ponyfm\Album;
 use Illuminate\Support\Facades\Auth;
 
 class DeleteAlbumCommand extends CommandBase
diff --git a/app/Commands/DeletePlaylistCommand.php b/app/Commands/DeletePlaylistCommand.php
index f06821a8..3ab05751 100644
--- a/app/Commands/DeletePlaylistCommand.php
+++ b/app/Commands/DeletePlaylistCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Playlist;
+use Poniverse\Ponyfm\Playlist;
 use Illuminate\Support\Facades\Auth;
 
 class DeletePlaylistCommand extends CommandBase
diff --git a/app/Commands/DeleteTrackCommand.php b/app/Commands/DeleteTrackCommand.php
index bf0ebcff..5573c029 100644
--- a/app/Commands/DeleteTrackCommand.php
+++ b/app/Commands/DeleteTrackCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 
 class DeleteTrackCommand extends CommandBase
 {
diff --git a/app/Commands/EditAlbumCommand.php b/app/Commands/EditAlbumCommand.php
index 9f594bc5..fa862c48 100644
--- a/app/Commands/EditAlbumCommand.php
+++ b/app/Commands/EditAlbumCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Album;
-use App\Image;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Image;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Commands/EditPlaylistCommand.php b/app/Commands/EditPlaylistCommand.php
index 46f7d4ef..4a04efb8 100644
--- a/app/Commands/EditPlaylistCommand.php
+++ b/app/Commands/EditPlaylistCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\PinnedPlaylist;
-use App\Playlist;
+use Poniverse\Ponyfm\PinnedPlaylist;
+use Poniverse\Ponyfm\Playlist;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
diff --git a/app/Commands/EditTrackCommand.php b/app/Commands/EditTrackCommand.php
index a509e03c..f1931cc8 100644
--- a/app/Commands/EditTrackCommand.php
+++ b/app/Commands/EditTrackCommand.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Album;
-use App\Image;
-use App\Track;
-use App\User;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Commands/SaveAccountSettingsCommand.php b/app/Commands/SaveAccountSettingsCommand.php
index 830d3834..13981cdf 100644
--- a/app/Commands/SaveAccountSettingsCommand.php
+++ b/app/Commands/SaveAccountSettingsCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Image;
+use Poniverse\Ponyfm\Image;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
diff --git a/app/Commands/ToggleFavouriteCommand.php b/app/Commands/ToggleFavouriteCommand.php
index 54bcb4f0..1928e71e 100644
--- a/app/Commands/ToggleFavouriteCommand.php
+++ b/app/Commands/ToggleFavouriteCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Favourite;
-use App\ResourceUser;
+use Poniverse\Ponyfm\Favourite;
+use Poniverse\Ponyfm\ResourceUser;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Commands/ToggleFollowingCommand.php b/app/Commands/ToggleFollowingCommand.php
index 10c07f6e..c0359138 100644
--- a/app/Commands/ToggleFollowingCommand.php
+++ b/app/Commands/ToggleFollowingCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Follower;
-use App\ResourceUser;
+use Poniverse\Ponyfm\Follower;
+use Poniverse\Ponyfm\ResourceUser;
 use Illuminate\Support\Facades\Auth;
 
 class ToggleFollowingCommand extends CommandBase
diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index b445ac9d..0d2999a4 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Commands;
+namespace Poniverse\Ponyfm\Commands;
 
-use App\Track;
-use App\TrackFile;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\TrackFile;
 use AudioCache;
 use File;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Comment.php b/app/Comment.php
index 51f3b8d5..e11f9901 100644
--- a/app/Comment.php
+++ b/app/Comment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -16,27 +16,27 @@ class Comment extends Model
 
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Poniverse\Ponyfm\User');
     }
 
     public function track()
     {
-        return $this->belongsTo('App\Track');
+        return $this->belongsTo('Poniverse\Ponyfm\Track');
     }
 
     public function album()
     {
-        return $this->belongsTo('App\Album');
+        return $this->belongsTo('Poniverse\Ponyfm\Album');
     }
 
     public function playlist()
     {
-        return $this->belongsTo('App\Playlist');
+        return $this->belongsTo('Poniverse\Ponyfm\Playlist');
     }
 
     public function profile()
     {
-        return $this->belongsTo('App\User', 'profile_id');
+        return $this->belongsTo('Poniverse\Ponyfm\User', 'profile_id');
     }
 
     public static function mapPublic($comment)
diff --git a/app/Console/Commands/BootstrapLocalEnvironment.php b/app/Console/Commands/BootstrapLocalEnvironment.php
index 4eb46f41..baad75bf 100644
--- a/app/Console/Commands/BootstrapLocalEnvironment.php
+++ b/app/Console/Commands/BootstrapLocalEnvironment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
 use Illuminate\Console\Command;
 
diff --git a/app/Console/Commands/ClassifyMLPMA.php b/app/Console/Commands/ClassifyMLPMA.php
index d1866d49..649bc315 100644
--- a/app/Console/Commands/ClassifyMLPMA.php
+++ b/app/Console/Commands/ClassifyMLPMA.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
-use App\ShowSong;
-use App\Track;
-use App\TrackType;
+use Poniverse\Ponyfm\ShowSong;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\TrackType;
 use DB;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
diff --git a/app/Console/Commands/FixYearZeroLogs.php b/app/Console/Commands/FixYearZeroLogs.php
index ca17e81d..85b9ceb1 100644
--- a/app/Console/Commands/FixYearZeroLogs.php
+++ b/app/Console/Commands/FixYearZeroLogs.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
 use Carbon\Carbon;
-use App\ResourceLogItem;
+use Poniverse\Ponyfm\ResourceLogItem;
 use Illuminate\Console\Command;
 
 class FixYearZeroLogs extends Command
diff --git a/app/Console/Commands/ImportMLPMA.php b/app/Console/Commands/ImportMLPMA.php
index 0cf04b77..e312acb0 100644
--- a/app/Console/Commands/ImportMLPMA.php
+++ b/app/Console/Commands/ImportMLPMA.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
-use App\Album;
-use App\Commands\UploadTrackCommand;
-use App\Genre;
-use App\Image;
-use App\Track;
-use App\User;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Commands\UploadTrackCommand;
+use Poniverse\Ponyfm\Genre;
+use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\User;
 use Auth;
 use Carbon\Carbon;
 use Config;
diff --git a/app/Console/Commands/Inspire.php b/app/Console/Commands/Inspire.php
index db9ab854..f8b22953 100644
--- a/app/Console/Commands/Inspire.php
+++ b/app/Console/Commands/Inspire.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
diff --git a/app/Console/Commands/MigrateOldData.php b/app/Console/Commands/MigrateOldData.php
index e4cae80e..9b994792 100644
--- a/app/Console/Commands/MigrateOldData.php
+++ b/app/Console/Commands/MigrateOldData.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
-use App\Image;
-use App\ResourceLogItem;
+use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\ResourceLogItem;
 use DB;
 use Exception;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/PoniverseApiSetup.php b/app/Console/Commands/PoniverseApiSetup.php
index 86c4b91b..fb5e312e 100644
--- a/app/Console/Commands/PoniverseApiSetup.php
+++ b/app/Console/Commands/PoniverseApiSetup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
 use GuzzleHttp\Exception\ClientException;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/RebuildTags.php b/app/Console/Commands/RebuildTags.php
index 46820ec2..33a8cfd7 100644
--- a/app/Console/Commands/RebuildTags.php
+++ b/app/Console/Commands/RebuildTags.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Console\Command;
 
 class RebuildTags extends Command
diff --git a/app/Console/Commands/RefreshCache.php b/app/Console/Commands/RefreshCache.php
index 88593c3d..ee965d26 100644
--- a/app/Console/Commands/RefreshCache.php
+++ b/app/Console/Commands/RefreshCache.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace Poniverse\Ponyfm\Console\Commands;
 
-use App\ResourceLogItem;
+use Poniverse\Ponyfm\ResourceLogItem;
 use DB;
 use Illuminate\Console\Command;
 
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index de25ac98..8640500f 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console;
+namespace Poniverse\Ponyfm\Console;
 
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -13,14 +13,14 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        \App\Console\Commands\MigrateOldData::class,
-        \App\Console\Commands\RefreshCache::class,
-        \App\Console\Commands\ImportMLPMA::class,
-        \App\Console\Commands\ClassifyMLPMA::class,
-        \App\Console\Commands\RebuildTags::class,
-        \App\Console\Commands\FixYearZeroLogs::class,
-        \App\Console\Commands\BootstrapLocalEnvironment::class,
-        \App\Console\Commands\PoniverseApiSetup::class,
+        \Poniverse\Ponyfm\Console\Commands\MigrateOldData::class,
+        \Poniverse\Ponyfm\Console\Commands\RefreshCache::class,
+        \Poniverse\Ponyfm\Console\Commands\ImportMLPMA::class,
+        \Poniverse\Ponyfm\Console\Commands\ClassifyMLPMA::class,
+        \Poniverse\Ponyfm\Console\Commands\RebuildTags::class,
+        \Poniverse\Ponyfm\Console\Commands\FixYearZeroLogs::class,
+        \Poniverse\Ponyfm\Console\Commands\BootstrapLocalEnvironment::class,
+        \Poniverse\Ponyfm\Console\Commands\PoniverseApiSetup::class,
     ];
 
     /**
diff --git a/app/Events/Event.php b/app/Events/Event.php
index ba2f8883..2ef6c6e1 100644
--- a/app/Events/Event.php
+++ b/app/Events/Event.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events;
+namespace Poniverse\Ponyfm\Events;
 
 abstract class Event
 {
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 2cc435b7..03ddf82b 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Exceptions;
+namespace Poniverse\Ponyfm\Exceptions;
 
 use Exception;
 use Symfony\Component\HttpKernel\Exception\HttpException;
diff --git a/app/Favourite.php b/app/Favourite.php
index 82805431..aa602b90 100644
--- a/app/Favourite.php
+++ b/app/Favourite.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -17,22 +17,22 @@ class Favourite extends Model
 
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Poniverse\Ponyfm\User');
     }
 
     public function track()
     {
-        return $this->belongsTo('App\Track');
+        return $this->belongsTo('Poniverse\Ponyfm\Track');
     }
 
     public function album()
     {
-        return $this->belongsTo('App\Album');
+        return $this->belongsTo('Poniverse\Ponyfm\Album');
     }
 
     public function playlist()
     {
-        return $this->belongsTo('App\Playlist');
+        return $this->belongsTo('Poniverse\Ponyfm\Playlist');
     }
 
     /**
diff --git a/app/Follower.php b/app/Follower.php
index 94f55059..06a21777 100644
--- a/app/Follower.php
+++ b/app/Follower.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Genre.php b/app/Genre.php
index a09ec786..9cef4995 100644
--- a/app/Genre.php
+++ b/app/Genre.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
-use App\Traits\SlugTrait;
+use Poniverse\Ponyfm\Traits\SlugTrait;
 use Illuminate\Database\Eloquent\Model;
 
 class Genre extends Model
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index d60410c6..0422c8b6 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Redirect;
diff --git a/app/Http/Controllers/AlbumsController.php b/app/Http/Controllers/AlbumsController.php
index c8799ac5..6069882a 100644
--- a/app/Http/Controllers/AlbumsController.php
+++ b/app/Http/Controllers/AlbumsController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
-use App\AlbumDownloader;
+use Poniverse\Ponyfm\AlbumDownloader;
 use App;
-use App\Album;
-use App\ResourceLogItem;
-use App\Track;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\ResourceLogItem;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Support\Facades\Redirect;
 use View;
 
diff --git a/app/Http/Controllers/Api/Mobile/TracksController.php b/app/Http/Controllers/Api/Mobile/TracksController.php
index 781c08d8..def26695 100644
--- a/app/Http/Controllers/Api/Mobile/TracksController.php
+++ b/app/Http/Controllers/Api/Mobile/TracksController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\Mobile;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Mobile;
 
-use App\Http\Controllers\Controller;
-use App\Track;
+use Poniverse\Ponyfm\Http\Controllers\Controller;
+use Poniverse\Ponyfm\Track;
 use Response;
 
 class TracksController extends Controller
diff --git a/app/Http/Controllers/Api/V1/TracksController.php b/app/Http/Controllers/Api/V1/TracksController.php
index b55bb019..6f41a0ee 100644
--- a/app/Http/Controllers/Api/V1/TracksController.php
+++ b/app/Http/Controllers/Api/V1/TracksController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\V1;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\V1;
 
-use App\Image;
-use App\Track;
+use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\Track;
 use Cover;
 use Illuminate\Support\Facades\Response;
 
diff --git a/app/Http/Controllers/Api/Web/AccountController.php b/app/Http/Controllers/Api/Web/AccountController.php
index 462a71c9..f34c624b 100644
--- a/app/Http/Controllers/Api/Web/AccountController.php
+++ b/app/Http/Controllers/Api/Web/AccountController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Http\Controllers\ApiControllerBase;
-use App\Commands\SaveAccountSettingsCommand;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Commands\SaveAccountSettingsCommand;
 use Cover;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index 446a9916..50c09f4e 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Album;
-use App\Commands\CreateAlbumCommand;
-use App\Commands\DeleteAlbumCommand;
-use App\Commands\EditAlbumCommand;
-use App\Http\Controllers\ApiControllerBase;
-use App\Image;
-use App\ResourceLogItem;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Commands\CreateAlbumCommand;
+use Poniverse\Ponyfm\Commands\DeleteAlbumCommand;
+use Poniverse\Ponyfm\Commands\EditAlbumCommand;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\ResourceLogItem;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
diff --git a/app/Http/Controllers/Api/Web/ArtistsController.php b/app/Http/Controllers/Api/Web/ArtistsController.php
index f060f77c..e8e6eca4 100644
--- a/app/Http/Controllers/Api/Web/ArtistsController.php
+++ b/app/Http/Controllers/Api/Web/ArtistsController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Album;
-use App\Comment;
-use App\Favourite;
-use App\Http\Controllers\ApiControllerBase;
-use App\Image;
-use App\Track;
-use App\User;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Comment;
+use Poniverse\Ponyfm\Favourite;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\User;
 use Cover;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Input;
@@ -41,10 +41,10 @@ class ArtistsController extends ApiControllerBase
         $albums = [];
 
         foreach ($favs as $fav) {
-            if ($fav->type == 'App\Track') {
+            if ($fav->type == 'Poniverse\Ponyfm\Track') {
                 $tracks[] = Track::mapPublicTrackSummary($fav->track);
             } else {
-                if ($fav->type == 'App\Album') {
+                if ($fav->type == 'Poniverse\Ponyfm\Album') {
                     $albums[] = Album::mapPublicAlbumSummary($fav->album);
                 }
             }
diff --git a/app/Http/Controllers/Api/Web/AuthController.php b/app/Http/Controllers/Api/Web/AuthController.php
index ce347a04..b8d6ad4b 100644
--- a/app/Http/Controllers/Api/Web/AuthController.php
+++ b/app/Http/Controllers/Api/Web/AuthController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Http\Controllers\Controller;
+use Poniverse\Ponyfm\Http\Controllers\Controller;
 
 class AuthController extends Controller
 {
diff --git a/app/Http/Controllers/Api/Web/CommentsController.php b/app/Http/Controllers/Api/Web/CommentsController.php
index bf1a2a6d..b364b4f6 100644
--- a/app/Http/Controllers/Api/Web/CommentsController.php
+++ b/app/Http/Controllers/Api/Web/CommentsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
 use App;
-use App\Commands\CreateCommentCommand;
-use App\Comment;
-use App\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Commands\CreateCommentCommand;
+use Poniverse\Ponyfm\Comment;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
 
diff --git a/app/Http/Controllers/Api/Web/DashboardController.php b/app/Http/Controllers/Api/Web/DashboardController.php
index 3567bad2..d3db61ea 100644
--- a/app/Http/Controllers/Api/Web/DashboardController.php
+++ b/app/Http/Controllers/Api/Web/DashboardController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Http\Controllers\ApiControllerBase;
-use App\Track;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
diff --git a/app/Http/Controllers/Api/Web/FavouritesController.php b/app/Http/Controllers/Api/Web/FavouritesController.php
index ef7ac6e9..63c7c4d8 100644
--- a/app/Http/Controllers/Api/Web/FavouritesController.php
+++ b/app/Http/Controllers/Api/Web/FavouritesController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Album;
-use App\Commands\ToggleFavouriteCommand;
-use App\Favourite;
-use App\Http\Controllers\ApiControllerBase;
-use App\Playlist;
-use App\Track;
+use Poniverse\Ponyfm\Album;
+use Poniverse\Ponyfm\Commands\ToggleFavouriteCommand;
+use Poniverse\Ponyfm\Favourite;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Playlist;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
diff --git a/app/Http/Controllers/Api/Web/FollowController.php b/app/Http/Controllers/Api/Web/FollowController.php
index fa73bff8..f3bcd42d 100644
--- a/app/Http/Controllers/Api/Web/FollowController.php
+++ b/app/Http/Controllers/Api/Web/FollowController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Commands\ToggleFollowingCommand;
-use App\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Commands\ToggleFollowingCommand;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
 use Illuminate\Support\Facades\Input;
 
 class FollowController extends ApiControllerBase
diff --git a/app/Http/Controllers/Api/Web/ImagesController.php b/app/Http/Controllers/Api/Web/ImagesController.php
index 77b57433..f72aa458 100644
--- a/app/Http/Controllers/Api/Web/ImagesController.php
+++ b/app/Http/Controllers/Api/Web/ImagesController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Http\Controllers\ApiControllerBase;
-use App\Image;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Image;
 use Cover;
 use Illuminate\Support\Facades\Response;
 
diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php
index a71f1f81..e5744abb 100644
--- a/app/Http/Controllers/Api/Web/PlaylistsController.php
+++ b/app/Http/Controllers/Api/Web/PlaylistsController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Commands\AddTrackToPlaylistCommand;
-use App\Commands\CreatePlaylistCommand;
-use App\Commands\DeletePlaylistCommand;
-use App\Commands\EditPlaylistCommand;
-use App\Http\Controllers\ApiControllerBase;
-use App\Image;
-use App\Playlist;
-use App\ResourceLogItem;
+use Poniverse\Ponyfm\Commands\AddTrackToPlaylistCommand;
+use Poniverse\Ponyfm\Commands\CreatePlaylistCommand;
+use Poniverse\Ponyfm\Commands\DeletePlaylistCommand;
+use Poniverse\Ponyfm\Commands\EditPlaylistCommand;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\Image;
+use Poniverse\Ponyfm\Playlist;
+use Poniverse\Ponyfm\ResourceLogItem;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Response;
diff --git a/app/Http/Controllers/Api/Web/ProfilerController.php b/app/Http/Controllers/Api/Web/ProfilerController.php
index 2dbb4a79..564d52cd 100644
--- a/app/Http/Controllers/Api/Web/ProfilerController.php
+++ b/app/Http/Controllers/Api/Web/ProfilerController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Http\Controllers\Controller;
-use App\ProfileRequest;
+use Poniverse\Ponyfm\Http\Controllers\Controller;
+use Poniverse\Ponyfm\ProfileRequest;
 use Cache;
 use Config;
 use Response;
diff --git a/app/Http/Controllers/Api/Web/TaxonomiesController.php b/app/Http/Controllers/Api/Web/TaxonomiesController.php
index 1bc6f26d..32f19ed2 100644
--- a/app/Http/Controllers/Api/Web/TaxonomiesController.php
+++ b/app/Http/Controllers/Api/Web/TaxonomiesController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Genre;
-use App\Http\Controllers\ApiControllerBase;
-use App\License;
-use App\ShowSong;
-use App\TrackType;
+use Poniverse\Ponyfm\Genre;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\License;
+use Poniverse\Ponyfm\ShowSong;
+use Poniverse\Ponyfm\TrackType;
 use Illuminate\Support\Facades\DB;
 
 class TaxonomiesController extends ApiControllerBase
diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index ebfc334f..59cabaef 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Api\Web;
+namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
 
-use App\Commands\DeleteTrackCommand;
-use App\Commands\EditTrackCommand;
-use App\Commands\UploadTrackCommand;
-use App\Http\Controllers\ApiControllerBase;
-use App\ResourceLogItem;
-use App\Track;
+use Poniverse\Ponyfm\Commands\DeleteTrackCommand;
+use Poniverse\Ponyfm\Commands\EditTrackCommand;
+use Poniverse\Ponyfm\Commands\UploadTrackCommand;
+use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
+use Poniverse\Ponyfm\ResourceLogItem;
+use Poniverse\Ponyfm\Track;
 use Cover;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
diff --git a/app/Http/Controllers/ApiControllerBase.php b/app/Http/Controllers/ApiControllerBase.php
index 00e62f24..ed69d709 100644
--- a/app/Http/Controllers/ApiControllerBase.php
+++ b/app/Http/Controllers/ApiControllerBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use Response;
 
diff --git a/app/Http/Controllers/ArtistsController.php b/app/Http/Controllers/ArtistsController.php
index d9b8c7e5..dd523508 100644
--- a/app/Http/Controllers/ArtistsController.php
+++ b/app/Http/Controllers/ArtistsController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use App;
-use App\User;
+use Poniverse\Ponyfm\User;
 use View;
 use Redirect;
 
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index dd3a31a2..36ba6d3f 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
-use App\User;
+use Poniverse\Ponyfm\User;
 use Auth;
 use Config;
 use DB;
diff --git a/app/Http/Controllers/ContentController.php b/app/Http/Controllers/ContentController.php
index fd7182de..a23beaba 100644
--- a/app/Http/Controllers/ContentController.php
+++ b/app/Http/Controllers/ContentController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use View;
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 9be752a1..5ec619bc 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
diff --git a/app/Http/Controllers/FavouritesController.php b/app/Http/Controllers/FavouritesController.php
index 50d048d7..417ca4a4 100644
--- a/app/Http/Controllers/FavouritesController.php
+++ b/app/Http/Controllers/FavouritesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use View;
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 41a70f38..89970c0c 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use View;
 
diff --git a/app/Http/Controllers/ImagesController.php b/app/Http/Controllers/ImagesController.php
index 429c85a0..8b9dccd5 100644
--- a/app/Http/Controllers/ImagesController.php
+++ b/app/Http/Controllers/ImagesController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
-use App\Image;
+use Poniverse\Ponyfm\Image;
 use Config;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Redirect;
diff --git a/app/Http/Controllers/PlaylistsController.php b/app/Http/Controllers/PlaylistsController.php
index a2a3214d..3624a5b8 100644
--- a/app/Http/Controllers/PlaylistsController.php
+++ b/app/Http/Controllers/PlaylistsController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use App;
-use App\Playlist;
-use App\ResourceLogItem;
-use App\Track;
-use App\PlaylistDownloader;
+use Poniverse\Ponyfm\Playlist;
+use Poniverse\Ponyfm\ResourceLogItem;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\PlaylistDownloader;
 use Auth;
 use Illuminate\Support\Facades\Redirect;
 use View;
diff --git a/app/Http/Controllers/TracksController.php b/app/Http/Controllers/TracksController.php
index cf5dc384..ebcd9208 100644
--- a/app/Http/Controllers/TracksController.php
+++ b/app/Http/Controllers/TracksController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
-use App\ResourceLogItem;
-use App\Track;
-use App\TrackFile;
+use Poniverse\Ponyfm\ResourceLogItem;
+use Poniverse\Ponyfm\Track;
+use Poniverse\Ponyfm\TrackFile;
 use Auth;
 use Config;
 use Illuminate\Support\Facades\App;
diff --git a/app/Http/Controllers/UploaderController.php b/app/Http/Controllers/UploaderController.php
index 1d2d0089..f86f7373 100644
--- a/app/Http/Controllers/UploaderController.php
+++ b/app/Http/Controllers/UploaderController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
 use View;
 
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 56be19f7..8e970ef9 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace Poniverse\Ponyfm\Http\Controllers;
 
-use App\User;
+use Poniverse\Ponyfm\User;
 use File;
 use Illuminate\Support\Facades\App;
 
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index cc879ba5..ba558ca8 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http;
+namespace Poniverse\Ponyfm\Http;
 
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
@@ -13,12 +13,12 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
-        \App\Http\Middleware\EncryptCookies::class,
+        \Poniverse\Ponyfm\Http\Middleware\EncryptCookies::class,
         \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-        \App\Http\Middleware\VerifyCsrfToken::class,
-        \App\Http\Middleware\Profiler::class,
+        \Poniverse\Ponyfm\Http\Middleware\VerifyCsrfToken::class,
+        \Poniverse\Ponyfm\Http\Middleware\Profiler::class,
     ];
 
     /**
@@ -27,9 +27,9 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth' => \Poniverse\Ponyfm\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
-        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
-        'csrf' => \App\Http\Middleware\VerifyCsrfHeader::class,
+        'guest' => \Poniverse\Ponyfm\Http\Middleware\RedirectIfAuthenticated::class,
+        'csrf' => \Poniverse\Ponyfm\Http\Middleware\VerifyCsrfHeader::class,
     ];
 }
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index ffd3849d..0d426e32 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace Poniverse\Ponyfm\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index 3aa15f8d..5201f1a8 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace Poniverse\Ponyfm\Http\Middleware;
 
 use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
 
diff --git a/app/Http/Middleware/Profiler.php b/app/Http/Middleware/Profiler.php
index edaa1e67..2e70e7c3 100644
--- a/app/Http/Middleware/Profiler.php
+++ b/app/Http/Middleware/Profiler.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace Poniverse\Ponyfm\Http\Middleware;
 
 use App;
 use Closure;
@@ -8,7 +8,7 @@ use Cache;
 use Config;
 use DB;
 use Log;
-use App\ProfileRequest;
+use Poniverse\Ponyfm\ProfileRequest;
 use Symfony\Component\HttpFoundation\Response;
 
 class Profiler
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 495b629c..5deb8a5e 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace Poniverse\Ponyfm\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
diff --git a/app/Http/Middleware/VerifyCsrfHeader.php b/app/Http/Middleware/VerifyCsrfHeader.php
index 6a74f596..ae110727 100644
--- a/app/Http/Middleware/VerifyCsrfHeader.php
+++ b/app/Http/Middleware/VerifyCsrfHeader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace Poniverse\Ponyfm\Http\Middleware;
 
 use Closure;
 use Illuminate\Session\TokenMismatchException;
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
index a2c35414..f60393af 100644
--- a/app/Http/Middleware/VerifyCsrfToken.php
+++ b/app/Http/Middleware/VerifyCsrfToken.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace Poniverse\Ponyfm\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
index 76b2ffd4..c4c42609 100644
--- a/app/Http/Requests/Request.php
+++ b/app/Http/Requests/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace Poniverse\Ponyfm\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Image.php b/app/Image.php
index 14ba1e52..e7d98d2d 100644
--- a/app/Image.php
+++ b/app/Image.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use External;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php
index d99ae7e8..2cdaac90 100644
--- a/app/Jobs/Job.php
+++ b/app/Jobs/Job.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace Poniverse\Ponyfm\Jobs;
 
 use Illuminate\Bus\Queueable;
 
diff --git a/app/Library/PFMAuth.php b/app/Library/PFMAuth.php
index fd77170c..aed64e31 100644
--- a/app/Library/PFMAuth.php
+++ b/app/Library/PFMAuth.php
@@ -21,6 +21,6 @@ class PFMAuth extends EloquentUserProvider
 {
     function __construct()
     {
-        parent::__construct(new NullHasher(), 'App\User');
+        parent::__construct(new NullHasher(), 'Poniverse\Ponyfm\User');
     }
 }
\ No newline at end of file
diff --git a/app/License.php b/app/License.php
index 734551b8..148ec7fd 100644
--- a/app/License.php
+++ b/app/License.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/PinnedPlaylist.php b/app/PinnedPlaylist.php
index 1fc9b81b..0aa17ec0 100644
--- a/app/PinnedPlaylist.php
+++ b/app/PinnedPlaylist.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 
@@ -10,11 +10,11 @@ class PinnedPlaylist extends Model
 
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Poniverse\Ponyfm\User');
     }
 
     public function playlist()
     {
-        return $this->belongsTo('App\Playlist');
+        return $this->belongsTo('Poniverse\Ponyfm\Playlist');
     }
 }
\ No newline at end of file
diff --git a/app/Playlist.php b/app/Playlist.php
index 63785991..925bfe03 100644
--- a/app/Playlist.php
+++ b/app/Playlist.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Helpers;
 use Illuminate\Database\Eloquent\Model;
@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\URL;
-use App\Traits\SlugTrait;
+use Poniverse\Ponyfm\Traits\SlugTrait;
 
 class Playlist extends Model
 {
@@ -127,7 +127,7 @@ class Playlist extends Model
     public function tracks()
     {
         return $this
-            ->belongsToMany('App\Track')
+            ->belongsToMany('Poniverse\Ponyfm\Track')
             ->withPivot('position')
             ->withTimestamps()
             ->orderBy('position', 'asc');
@@ -135,22 +135,22 @@ class Playlist extends Model
 
     public function users()
     {
-        return $this->hasMany('App\ResourceUser');
+        return $this->hasMany('Poniverse\Ponyfm\ResourceUser');
     }
 
     public function comments()
     {
-        return $this->hasMany('App\Comment')->orderBy('created_at', 'desc');
+        return $this->hasMany('Poniverse\Ponyfm\Comment')->orderBy('created_at', 'desc');
     }
 
     public function pins()
     {
-        return $this->hasMany('App\PinnedPlaylist');
+        return $this->hasMany('Poniverse\Ponyfm\PinnedPlaylist');
     }
 
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Poniverse\Ponyfm\User');
     }
 
     public function hasPinFor($userId)
diff --git a/app/PlaylistDownloader.php b/app/PlaylistDownloader.php
index c95778ce..9310eaa3 100644
--- a/app/PlaylistDownloader.php
+++ b/app/PlaylistDownloader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use ZipStream;
 
diff --git a/app/ProfileRequest.php b/app/ProfileRequest.php
index f9183f42..08503dce 100644
--- a/app/ProfileRequest.php
+++ b/app/ProfileRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use DB;
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index ac62f504..b1695bb7 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Providers;
+namespace Poniverse\Ponyfm\Providers;
 
 use App;
 use Auth;
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 58ce9624..9d2695cb 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Providers;
+namespace Poniverse\Ponyfm\Providers;
 
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -13,8 +13,8 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        'App\Events\SomeEvent' => [
-            'App\Listeners\EventListener',
+        'Poniverse\Ponyfm\Events\SomeEvent' => [
+            'Poniverse\Ponyfm\Listeners\EventListener',
         ],
     ];
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index d50b1c0f..0e58e4cf 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Providers;
+namespace Poniverse\Ponyfm\Providers;
 
 use Illuminate\Routing\Router;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -14,7 +14,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    protected $namespace = 'App\Http\Controllers';
+    protected $namespace = 'Poniverse\Ponyfm\Http\Controllers';
 
     /**
      * Define your route model bindings, pattern filters, etc.
diff --git a/app/ResourceLogItem.php b/app/ResourceLogItem.php
index bac5f905..d61669f5 100644
--- a/app/ResourceLogItem.php
+++ b/app/ResourceLogItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 use Carbon\Carbon;
diff --git a/app/ResourceUser.php b/app/ResourceUser.php
index 2c22b314..cc9ea235 100644
--- a/app/ResourceUser.php
+++ b/app/ResourceUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/ShowSong.php b/app/ShowSong.php
index 293581c4..c92bf575 100644
--- a/app/ShowSong.php
+++ b/app/ShowSong.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Track.php b/app/Track.php
index 2322b221..3fd8fb60 100644
--- a/app/Track.php
+++ b/app/Track.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
-use App\Traits\SlugTrait;
+use Poniverse\Ponyfm\Traits\SlugTrait;
 use Exception;
 use External;
 use getid3_writetags;
@@ -332,52 +332,52 @@ class Track extends Model
 
     public function genre()
     {
-        return $this->belongsTo('App\Genre');
+        return $this->belongsTo('Poniverse\Ponyfm\Genre');
     }
 
     public function trackType()
     {
-        return $this->belongsTo('App\TrackType', 'track_type_id');
+        return $this->belongsTo('Poniverse\Ponyfm\TrackType', 'track_type_id');
     }
 
     public function comments()
     {
-        return $this->hasMany('App\Comment')->orderBy('created_at', 'desc');
+        return $this->hasMany('Poniverse\Ponyfm\Comment')->orderBy('created_at', 'desc');
     }
 
     public function favourites()
     {
-        return $this->hasMany('App\Favourite');
+        return $this->hasMany('Poniverse\Ponyfm\Favourite');
     }
 
     public function cover()
     {
-        return $this->belongsTo('App\Image');
+        return $this->belongsTo('Poniverse\Ponyfm\Image');
     }
 
     public function showSongs()
     {
-        return $this->belongsToMany('App\ShowSong');
+        return $this->belongsToMany('Poniverse\Ponyfm\ShowSong');
     }
 
     public function users()
     {
-        return $this->hasMany('App\ResourceUser');
+        return $this->hasMany('Poniverse\Ponyfm\ResourceUser');
     }
 
     public function user()
     {
-        return $this->belongsTo('App\User');
+        return $this->belongsTo('Poniverse\Ponyfm\User');
     }
 
     public function album()
     {
-        return $this->belongsTo('App\Album');
+        return $this->belongsTo('Poniverse\Ponyfm\Album');
     }
 
     public function trackFiles()
     {
-        return $this->hasMany('App\TrackFile');
+        return $this->hasMany('Poniverse\Ponyfm\TrackFile');
     }
 
     public function getYearAttribute()
diff --git a/app/TrackFile.php b/app/TrackFile.php
index 741231a4..3ad98c47 100644
--- a/app/TrackFile.php
+++ b/app/TrackFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Helpers;
 use Illuminate\Database\Eloquent\Model;
@@ -12,7 +12,7 @@ class TrackFile extends Model
 {
     public function track()
     {
-        return $this->belongsTo('App\Track');
+        return $this->belongsTo('Poniverse\Ponyfm\Track');
     }
 
     /**
diff --git a/app/TrackType.php b/app/TrackType.php
index fc0437df..4f9ac0dc 100644
--- a/app/TrackType.php
+++ b/app/TrackType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Traits/SlugTrait.php b/app/Traits/SlugTrait.php
index 8868bf5a..888596f0 100644
--- a/app/Traits/SlugTrait.php
+++ b/app/Traits/SlugTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Traits;
+namespace Poniverse\Ponyfm\Traits;
 
 use Illuminate\Support\Str;
 
diff --git a/app/User.php b/app/User.php
index 7082ba94..dddbd5b6 100644
--- a/app/User.php
+++ b/app/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App;
+namespace Poniverse\Ponyfm;
 
 use Exception;
 use Gravatar;
@@ -35,17 +35,17 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     public function avatar()
     {
-        return $this->belongsTo('App\Image');
+        return $this->belongsTo('Poniverse\Ponyfm\Image');
     }
 
     public function users()
     {
-        return $this->hasMany('App\ResourceUser', 'artist_id');
+        return $this->hasMany('Poniverse\Ponyfm\ResourceUser', 'artist_id');
     }
 
     public function comments()
     {
-        return $this->hasMany('App\Comment', 'profile_id')->orderBy('created_at', 'desc');
+        return $this->hasMany('Poniverse\Ponyfm\Comment', 'profile_id')->orderBy('created_at', 'desc');
     }
 
     public function getIsArchivedAttribute()
diff --git a/bootstrap/app.php b/bootstrap/app.php
index f2801adf..71512b1b 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -28,17 +28,17 @@ $app = new Illuminate\Foundation\Application(
 
 $app->singleton(
     Illuminate\Contracts\Http\Kernel::class,
-    App\Http\Kernel::class
+    Poniverse\Ponyfm\Http\Kernel::class
 );
 
 $app->singleton(
     Illuminate\Contracts\Console\Kernel::class,
-    App\Console\Kernel::class
+    Poniverse\Ponyfm\Console\Kernel::class
 );
 
 $app->singleton(
     Illuminate\Contracts\Debug\ExceptionHandler::class,
-    App\Exceptions\Handler::class
+    Poniverse\Ponyfm\Exceptions\Handler::class
 );
 
 /*
diff --git a/composer.json b/composer.json
index 40000d18..7a2e5908 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
             "app/Library"
         ],
         "psr-4": {
-            "App\\": "app/"
+            "Poniverse\\Ponyfm\\": "app/"
         }
     },
     "autoload-dev": {
diff --git a/config/app.php b/config/app.php
index a6ebd715..8fb5bbcb 100644
--- a/config/app.php
+++ b/config/app.php
@@ -140,9 +140,9 @@ return [
         /*
          * Application Service Providers...
          */
-        App\Providers\AppServiceProvider::class,
-        App\Providers\EventServiceProvider::class,
-        App\Providers\RouteServiceProvider::class,
+        Poniverse\Ponyfm\Providers\AppServiceProvider::class,
+        Poniverse\Ponyfm\Providers\EventServiceProvider::class,
+        Poniverse\Ponyfm\Providers\RouteServiceProvider::class,
 
         Intouch\LaravelNewrelic\NewrelicServiceProvider::class,
         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
diff --git a/config/auth.php b/config/auth.php
index 5223dd42..c9bf4000 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -28,7 +28,7 @@ return [
     |
     */
 
-    'model' => App\User::class,
+    'model' => Poniverse\Ponyfm\User::class,
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/services.php b/config/services.php
index 51abbbd1..4f128fbf 100644
--- a/config/services.php
+++ b/config/services.php
@@ -30,7 +30,7 @@ return [
     ],
 
     'stripe' => [
-        'model'  => App\User::class,
+        'model'  => Poniverse\Ponyfm\User::class,
         'key'    => '',
         'secret' => '',
     ],
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index ae7165b8..92b6f97d 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -11,7 +11,7 @@
 |
 */
 
-$factory->define(App\User::class, function ($faker) {
+$factory->define(Poniverse\Ponyfm\User::class, function ($faker) {
     return [
         'name' => $faker->name,
         'email' => $faker->email,
diff --git a/phpspec.yml b/phpspec.yml
index eb57939e..3f0070aa 100644
--- a/phpspec.yml
+++ b/phpspec.yml
@@ -1,5 +1,5 @@
 suites:
     main:
-        namespace: App
-        psr4_prefix: App
+        namespace: Poniverse\Ponyfm
+        psr4_prefix: Poniverse\Ponyfm
         src_path: app
\ No newline at end of file