diff --git a/.env.testing b/.env.testing
index 39a04a99..34f42875 100644
--- a/.env.testing
+++ b/.env.testing
@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=base64:k5FduZ4Vu5ONvcJysN6xZYlix606oNocewyXSyOEspQ=
+APP_KEY=base64:/yb14wOXR+PqqMWnzqE2YZxcvqwSYYKDHtrF0BpT5fM=
 APP_DEBUG=true
 APP_URL=http://localhost
 APP_DEMO=false
diff --git a/resources/js/store/modules/broadcasting.js b/resources/js/store/modules/broadcasting.js
index 720da4fc..a5c16f5c 100644
--- a/resources/js/store/modules/broadcasting.js
+++ b/resources/js/store/modules/broadcasting.js
@@ -11,7 +11,7 @@ const actions = {
         commit('SET_RUNNING_COMMUNICATION')
 
         Echo.private(`App.Users.Models.User.${getters.user.data.id}`)
-            .listen('.file.created', (event) => {
+            .listen('.RemoteFile.Created', (event) => {
                 commit('UPDATE_REMOTE_UPLOAD_QUEUE', event.payload)
 
                 // If user is located in same directory as remote upload was called, then show the files
diff --git a/routes/api.php b/routes/api.php
index 21dbd1e8..0accfb01 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -12,7 +12,6 @@ use Domain\SetupWizard\Controllers\PingAPIController;
 use Domain\Folders\Controllers\CreateFolderController;
 use Domain\Browsing\Controllers\BrowseFolderController;
 use Domain\Sharing\Controllers\ShareViaEmailController;
-use Domain\Files\Controllers\RemoteUploadFileController;
 use Domain\Folders\Controllers\NavigationTreeController;
 use Domain\Items\Controllers\MoveFileOrFolderController;
 use App\Socialite\Controllers\SocialiteRedirectController;
@@ -25,6 +24,7 @@ use Domain\Browsing\Controllers\BrowseLatestFilesController;
 use Domain\Browsing\Controllers\BrowseSharedItemsController;
 use Domain\Browsing\Controllers\BrowseTrashContentController;
 use Domain\Homepage\Controllers\SendContactMessageController;
+use Domain\RemoteUpload\Controllers\RemoteUploadFileController;
 use Domain\Sharing\Controllers\GetShareLinkViaQrCodeController;
 use App\Users\Controllers\Authentication\RegisterUserController;
 
diff --git a/routes/share.php b/routes/share.php
index df07f5c6..b79de0a5 100644
--- a/routes/share.php
+++ b/routes/share.php
@@ -7,12 +7,12 @@ use Domain\Files\Controllers\VisitorUploadFileController;
 use Domain\Folders\Controllers\VisitorCreateFolderController;
 use Domain\Sharing\Controllers\WebCrawlerOpenGraphController;
 use Domain\Browsing\Controllers\VisitorBrowseFolderController;
-use Domain\Files\Controllers\VisitorRemoteUploadFileController;
 use Domain\Items\Controllers\VisitorMoveFileOrFolderController;
 use Domain\Items\Controllers\VisitorDeleteFileOrFolderController;
 use Domain\Items\Controllers\VisitorRenameFileOrFolderController;
 use Domain\Sharing\Controllers\VisitorUnlockLockedShareController;
 use Domain\Folders\Controllers\VisitorNavigationFolderTreeController;
+use Domain\RemoteUpload\Controllers\VisitorRemoteUploadFileController;
 use Domain\Browsing\Controllers\VisitorSearchFilesAndFoldersController;
 
 // Browse functions
diff --git a/routes/upload-request.php b/routes/upload-request.php
index 9912ae62..e2892283 100644
--- a/routes/upload-request.php
+++ b/routes/upload-request.php
@@ -10,7 +10,7 @@ use Domain\UploadRequest\Controllers\MoveItemInUploadRequestController;
 use Domain\UploadRequest\Controllers\SetUploadRequestAsFilledController;
 use Domain\UploadRequest\Controllers\UploadFilesForUploadRequestController;
 use Domain\UploadRequest\Controllers\GetFolderTreeForUploadRequestController;
-use Domain\UploadRequest\Controllers\UploadFilesRemotelyForUploadRequestController;
+use Domain\RemoteUpload\Controllers\UploadFilesRemotelyForUploadRequestController;
 
 Route::get('/{uploadRequest}', GetUploadRequestController::class);
 
diff --git a/src/App/Console/Commands/SetupWebsocketEnvironment.php b/src/App/Console/Commands/SetupWebsocketEnvironment.php
index 48f3f8c3..7cd5aba5 100644
--- a/src/App/Console/Commands/SetupWebsocketEnvironment.php
+++ b/src/App/Console/Commands/SetupWebsocketEnvironment.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
diff --git a/src/App/Console/Kernel.php b/src/App/Console/Kernel.php
index 8a44a3b7..056381c9 100644
--- a/src/App/Console/Kernel.php
+++ b/src/App/Console/Kernel.php
@@ -1,13 +1,13 @@
 <?php
 namespace App\Console;
 
-use App\Console\Commands\SetupWebsocketEnvironment;
 use Illuminate\Console\Scheduling\Schedule;
 use App\Console\Commands\SetupDevEnvironment;
 use App\Console\Commands\SetupProdEnvironment;
 use Support\Scheduler\Actions\ReportUsageAction;
 use Support\Upgrading\Actions\UpdateSystemAction;
 use Support\Demo\Actions\ClearHowdyDemoDataAction;
+use App\Console\Commands\SetupWebsocketEnvironment;
 use Support\Scheduler\Actions\DeleteFailedFilesAction;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 use Support\Scheduler\Actions\DeleteUnverifiedUsersAction;
diff --git a/src/Domain/Files/Actions/GetContentFromExternalSource.php b/src/Domain/RemoteUpload/Actions/GetContentFromExternalSource.php
similarity index 85%
rename from src/Domain/Files/Actions/GetContentFromExternalSource.php
rename to src/Domain/RemoteUpload/Actions/GetContentFromExternalSource.php
index f9fdf94c..cb8b26c1 100644
--- a/src/Domain/Files/Actions/GetContentFromExternalSource.php
+++ b/src/Domain/RemoteUpload/Actions/GetContentFromExternalSource.php
@@ -1,9 +1,6 @@
 <?php
+namespace Domain\RemoteUpload\Actions;
 
-namespace Domain\Files\Actions;
-
-use Domain\Files\Events\NewFileWasStoredEvent;
-use Domain\Files\Resources\FileResource;
 use Log;
 use Error;
 use ErrorException;
@@ -12,23 +9,31 @@ use Illuminate\Support\Str;
 use Domain\Files\Models\File;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
+use Domain\Files\Resources\FileResource;
+use Domain\Files\Actions\ProcessFileAction;
 use Spatie\QueueableAction\QueueableAction;
+use Domain\Files\Actions\MoveFileToFTPStorageAction;
+use Domain\Files\Actions\ProcessImageThumbnailAction;
+use Domain\Files\Actions\StoreFileExifMetadataAction;
+use Domain\RemoteUpload\Events\RemoteFileCreatedEvent;
+use Domain\Files\Actions\MoveFileToExternalStorageAction;
 
 class GetContentFromExternalSource
 {
     use QueueableAction;
 
     public function __construct(
-        public ProcessFileAction               $processFile,
-        public StoreFileExifMetadataAction     $storeExifMetadata,
-        public MoveFileToFTPStorageAction      $moveFileToFTPStorage,
-        public ProcessImageThumbnailAction     $createImageThumbnail,
+        public ProcessFileAction $processFile,
+        public StoreFileExifMetadataAction $storeExifMetadata,
+        public MoveFileToFTPStorageAction $moveFileToFTPStorage,
+        public ProcessImageThumbnailAction $createImageThumbnail,
         public MoveFileToExternalStorageAction $moveFileToExternalStorage,
-    ) {}
+    ) {
+    }
 
     public function __invoke(
         array $payload,
-        User  $user,
+        User $user,
     ) {
         $total = count($payload['urls']);
         $processed = 0;
@@ -91,7 +96,7 @@ class GetContentFromExternalSource
                 $processed++;
 
                 // Broadcast new file into the frontend
-                NewFileWasStoredEvent::dispatch([
+                RemoteFileCreatedEvent::dispatch([
                     'progress' => [
                         'total'     => $total,
                         'processed' => $processed,
@@ -105,7 +110,7 @@ class GetContentFromExternalSource
                 $failed++;
 
                 // Broadcast new file into the frontend
-                NewFileWasStoredEvent::dispatch([
+                RemoteFileCreatedEvent::dispatch([
                     'progress' => [
                         'total'     => $total,
                         'processed' => $processed,
diff --git a/src/Domain/Files/Controllers/RemoteUploadFileController.php b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
similarity index 92%
rename from src/Domain/Files/Controllers/RemoteUploadFileController.php
rename to src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
index 3be95aee..ee4df71f 100644
--- a/src/Domain/Files/Controllers/RemoteUploadFileController.php
+++ b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
@@ -1,12 +1,12 @@
 <?php
-namespace Domain\Files\Controllers;
+namespace Domain\RemoteUpload\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Domain\Files\Requests\RemoteUploadRequest;
-use Domain\Files\Actions\GetContentFromExternalSource;
+use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
 
 class RemoteUploadFileController extends Controller
 {
diff --git a/src/Domain/UploadRequest/Controllers/UploadFilesRemotelyForUploadRequestController.php b/src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
similarity index 95%
rename from src/Domain/UploadRequest/Controllers/UploadFilesRemotelyForUploadRequestController.php
rename to src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
index b9b9ba22..e342798f 100644
--- a/src/Domain/UploadRequest/Controllers/UploadFilesRemotelyForUploadRequestController.php
+++ b/src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php
@@ -1,12 +1,12 @@
 <?php
-namespace Domain\UploadRequest\Controllers;
+namespace Domain\RemoteUpload\Controllers;
 
 use DB;
 use Domain\Folders\Models\Folder;
 use Domain\Files\Requests\RemoteUploadRequest;
 use Domain\UploadRequest\Models\UploadRequest;
-use Domain\Files\Actions\GetContentFromExternalSource;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
 
 class UploadFilesRemotelyForUploadRequestController
 {
diff --git a/src/Domain/Files/Controllers/VisitorRemoteUploadFileController.php b/src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
similarity index 93%
rename from src/Domain/Files/Controllers/VisitorRemoteUploadFileController.php
rename to src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
index ef5a5ee7..f2864a61 100644
--- a/src/Domain/Files/Controllers/VisitorRemoteUploadFileController.php
+++ b/src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Files\Controllers;
+namespace Domain\RemoteUpload\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 use Domain\Files\Requests\RemoteUploadRequest;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 use Domain\Sharing\Actions\VerifyAccessToItemAction;
-use Domain\Files\Actions\GetContentFromExternalSource;
+use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
 
 class VisitorRemoteUploadFileController extends Controller
 {
diff --git a/src/Domain/Files/Events/NewFileWasStoredEvent.php b/src/Domain/RemoteUpload/Events/RemoteFileCreatedEvent.php
similarity index 82%
rename from src/Domain/Files/Events/NewFileWasStoredEvent.php
rename to src/Domain/RemoteUpload/Events/RemoteFileCreatedEvent.php
index cfd386c8..9643cbeb 100644
--- a/src/Domain/Files/Events/NewFileWasStoredEvent.php
+++ b/src/Domain/RemoteUpload/Events/RemoteFileCreatedEvent.php
@@ -1,15 +1,13 @@
 <?php
+namespace Domain\RemoteUpload\Events;
 
-namespace Domain\Files\Events;
-
-use Domain\Files\Resources\FileResource;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
 
-class NewFileWasStoredEvent implements ShouldBroadcastNow
+class RemoteFileCreatedEvent implements ShouldBroadcastNow
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
@@ -20,14 +18,15 @@ class NewFileWasStoredEvent implements ShouldBroadcastNow
      */
     public function __construct(
         public array $payload,
-    ) {}
+    ) {
+    }
 
     /**
      * The event's broadcast name.
      */
     public function broadcastAs(): string
     {
-        return 'file.created';
+        return 'RemoteFile.Created';
     }
 
     /**
diff --git a/src/Domain/Settings/Actions/TestS3ConnectionAction.php b/src/Domain/Settings/Actions/TestS3ConnectionAction.php
index 708f334e..124d1bf6 100644
--- a/src/Domain/Settings/Actions/TestS3ConnectionAction.php
+++ b/src/Domain/Settings/Actions/TestS3ConnectionAction.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Settings\Actions;
 
 use Storage;
diff --git a/tests/Domain/Files/FileTest.php b/tests/Domain/Files/FileTest.php
index 5650c5ca..8026f834 100644
--- a/tests/Domain/Files/FileTest.php
+++ b/tests/Domain/Files/FileTest.php
@@ -11,7 +11,7 @@ use Domain\Folders\Models\Folder;
 use Illuminate\Http\UploadedFile;
 use Domain\Settings\Models\Setting;
 use Illuminate\Support\Facades\Http;
-use Domain\Files\Events\NewFileWasStoredEvent;
+use Domain\RemoteUpload\Events\RemoteFileCreatedEvent;
 
 class FileTest extends TestCase
 {
@@ -111,7 +111,7 @@ class FileTest extends TestCase
     public function it_remotely_upload_new_file()
     {
         Event::fake([
-            NewFileWasStoredEvent::class,
+            RemoteFileCreatedEvent::class,
         ]);
 
         $user = User::factory()
@@ -153,7 +153,7 @@ class FileTest extends TestCase
 
         File::all()
             ->each(function ($file) {
-                Event::assertDispatched(fn(NewFileWasStoredEvent $event) => $event->payload['file']->id === $file->id);
+                Event::assertDispatched(fn (RemoteFileCreatedEvent $event) => $event->payload['file']->id === $file->id);
 
                 Storage::assertExists("files/$file->user_id/$file->basename");
             });