diff --git a/app/Http/Livewire/CategoryEditForm.php b/app/Livewire/CategoryEditForm.php
similarity index 98%
rename from app/Http/Livewire/CategoryEditForm.php
rename to app/Livewire/CategoryEditForm.php
index 05a1fe9d45..28a06657c1 100644
--- a/app/Http/Livewire/CategoryEditForm.php
+++ b/app/Livewire/CategoryEditForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use Livewire\Component;
 
diff --git a/app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
similarity index 97%
rename from app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
rename to app/Livewire/CustomFieldSetDefaultValuesForModel.php
index e1487d2151..a4a9f9fe71 100644
--- a/app/Http/Livewire/CustomFieldSetDefaultValuesForModel.php
+++ b/app/Livewire/CustomFieldSetDefaultValuesForModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use Livewire\Component;
 
diff --git a/app/Http/Livewire/Importer.php b/app/Livewire/Importer.php
similarity index 99%
rename from app/Http/Livewire/Importer.php
rename to app/Livewire/Importer.php
index 318514af73..f4d85bb5e1 100644
--- a/app/Http/Livewire/Importer.php
+++ b/app/Livewire/Importer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use App\Models\CustomField;
 use Livewire\Component;
@@ -60,7 +60,7 @@ class Importer extends Component
     ];
 
     /**
-     * This is used in resources/views/livewire/importer.blade.php, and we kinda shouldn't need to check for
+     * This is used in resources/views/livewire.importer.blade.php, and we kinda shouldn't need to check for
      * activeFile here, but there's some UI goofiness that allows this to crash out on some imports.
      *
      * @return string
@@ -548,7 +548,7 @@ class Importer extends Component
     public function render()
     {
         $this->files = Import::orderBy('id','desc')->get(); //HACK - slows down renders.
-        return view('livewire.importer')
+        return view('')
                 ->extends('layouts.default')
                 ->section('content');
     }
diff --git a/app/Http/Livewire/LoginForm.php b/app/Livewire/LoginForm.php
similarity index 98%
rename from app/Http/Livewire/LoginForm.php
rename to app/Livewire/LoginForm.php
index 8c8dd603b1..670c046e27 100644
--- a/app/Http/Livewire/LoginForm.php
+++ b/app/Livewire/LoginForm.php
@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use Livewire\Component;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Http/Livewire/OauthClients.php b/app/Livewire/OauthClients.php
similarity index 99%
rename from app/Http/Livewire/OauthClients.php
rename to app/Livewire/OauthClients.php
index 0f7d130e91..78f4aab9d6 100644
--- a/app/Http/Livewire/OauthClients.php
+++ b/app/Livewire/OauthClients.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Http/Livewire/PersonalAccessTokens.php b/app/Livewire/PersonalAccessTokens.php
similarity index 97%
rename from app/Http/Livewire/PersonalAccessTokens.php
rename to app/Livewire/PersonalAccessTokens.php
index 35ba3e1dae..ca96f030f4 100644
--- a/app/Http/Livewire/PersonalAccessTokens.php
+++ b/app/Livewire/PersonalAccessTokens.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Livewire/SlackSettingsForm.php
similarity index 99%
rename from app/Http/Livewire/SlackSettingsForm.php
rename to app/Livewire/SlackSettingsForm.php
index 6370649373..f5908f798c 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Livewire/SlackSettingsForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Livewire;
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Http;
diff --git a/routes/web.php b/routes/web.php
index 88bba08f81..b96d32d811 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -262,7 +262,7 @@ Route::group(['prefix' => 'admin', 'middleware' => ['auth', 'authorize:superuser
 */
 
 Route::get('/import',
-    \App\Http\Livewire\Importer::class
+    \App\Livewire\Importer::class
 )->middleware('auth')->name('imports.index');
 
 /*
diff --git a/tests/Feature/Livewire/CategoryEditFormTest.php b/tests/Feature/Livewire/CategoryEditFormTest.php
index 26719e4041..a439f544ac 100644
--- a/tests/Feature/Livewire/CategoryEditFormTest.php
+++ b/tests/Feature/Livewire/CategoryEditFormTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Livewire;
 
-use App\Http\Livewire\CategoryEditForm;
+use App\Livewire\CategoryEditForm;
 use Livewire\Livewire;
 use Tests\TestCase;