diff --git a/composer.json b/composer.json
index fe8a366b75..2bb1bbd75c 100644
--- a/composer.json
+++ b/composer.json
@@ -35,12 +35,10 @@
             "src/helpers.php"
         ],
         "psr-4": {
-            "Filament\\": [
-                "packages/forms/src",
-                "packages/tables/src",
-                "src"
-            ],
-            "Filament\\Database\\Factories\\": "database/factories"
+            "Filament\\": "src",
+            "Filament\\Forms\\": "packages/forms/src",
+            "Filament\\Database\\Factories\\": "database/factories",
+            "Filament\\Tables\\": "packages/tables/src"
         }
     },
     "autoload-dev": {
@@ -52,8 +50,8 @@
         "laravel": {
             "providers": [
                 "Filament\\FilamentServiceProvider",
-                "Filament\\FormsServiceProvider",
-                "Filament\\TablesServiceProvider"
+                "Filament\\Forms\\FormsServiceProvider",
+                "Filament\\Tables\\TablesServiceProvider"
             ],
             "aliases": {
                 "FilamentManager": "Filament\\Filament"
diff --git a/packages/forms/composer.json b/packages/forms/composer.json
index 3a3de8742a..71eaf91605 100644
--- a/packages/forms/composer.json
+++ b/packages/forms/composer.json
@@ -19,13 +19,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Filament\\": "src"
+            "Filament\\Forms\\": "src"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "TablesServiceProvider"
+                "Filament\\Forms\\FormsServiceProvider"
             ]
         }
     },
diff --git a/packages/forms/src/Fields/Checkbox.php b/packages/forms/src/Fields/Checkbox.php
index 4d2c7d4801..ab1e47edcb 100644
--- a/packages/forms/src/Fields/Checkbox.php
+++ b/packages/forms/src/Fields/Checkbox.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 
 class Checkbox extends InputField
 {
diff --git a/packages/forms/src/Fields/Concerns/CanBeAutocompleted.php b/packages/forms/src/Fields/Concerns/CanBeAutocompleted.php
index ad37897f82..09d05a8fe9 100644
--- a/packages/forms/src/Fields/Concerns/CanBeAutocompleted.php
+++ b/packages/forms/src/Fields/Concerns/CanBeAutocompleted.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields\Concerns;
+namespace Filament\Forms\Fields\Concerns;
 
 trait CanBeAutocompleted
 {
diff --git a/packages/forms/src/Fields/Concerns/CanBeAutofocused.php b/packages/forms/src/Fields/Concerns/CanBeAutofocused.php
index 645af3166d..8661b2f95e 100644
--- a/packages/forms/src/Fields/Concerns/CanBeAutofocused.php
+++ b/packages/forms/src/Fields/Concerns/CanBeAutofocused.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields\Concerns;
+namespace Filament\Forms\Fields\Concerns;
 
 trait CanBeAutofocused
 {
diff --git a/packages/forms/src/Fields/Concerns/CanBeCompared.php b/packages/forms/src/Fields/Concerns/CanBeCompared.php
index 8493cfd2de..1e834d625e 100644
--- a/packages/forms/src/Fields/Concerns/CanBeCompared.php
+++ b/packages/forms/src/Fields/Concerns/CanBeCompared.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields\Concerns;
+namespace Filament\Forms\Fields\Concerns;
 
 trait CanBeCompared
 {
diff --git a/packages/forms/src/Fields/Concerns/CanBeDisabled.php b/packages/forms/src/Fields/Concerns/CanBeDisabled.php
index bf677b277f..24d49b1521 100644
--- a/packages/forms/src/Fields/Concerns/CanBeDisabled.php
+++ b/packages/forms/src/Fields/Concerns/CanBeDisabled.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields\Concerns;
+namespace Filament\Forms\Fields\Concerns;
 
 trait CanBeDisabled
 {
diff --git a/packages/forms/src/Fields/Concerns/CanBeLengthConstrained.php b/packages/forms/src/Fields/Concerns/CanBeLengthConstrained.php
index b726832678..ceeb61054a 100644
--- a/packages/forms/src/Fields/Concerns/CanBeLengthConstrained.php
+++ b/packages/forms/src/Fields/Concerns/CanBeLengthConstrained.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields\Concerns;
+namespace Filament\Forms\Fields\Concerns;
 
 trait CanBeLengthConstrained
 {
diff --git a/packages/forms/src/Fields/Concerns/CanBeUnique.php b/packages/forms/src/Fields/Concerns/CanBeUnique.php
index ab271964b4..6c8a879d5a 100644
--- a/packages/forms/src/Fields/Concerns/CanBeUnique.php
+++ b/packages/forms/src/Fields/Concerns/CanBeUnique.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields\Concerns;
+namespace Filament\Forms\Fields\Concerns;
 
 trait CanBeUnique
 {
diff --git a/packages/forms/src/Fields/Concerns/HasPlaceholder.php b/packages/forms/src/Fields/Concerns/HasPlaceholder.php
index 5801b62cab..25957bf572 100644
--- a/packages/forms/src/Fields/Concerns/HasPlaceholder.php
+++ b/packages/forms/src/Fields/Concerns/HasPlaceholder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields\Concerns;
+namespace Filament\Forms\Fields\Concerns;
 
 trait HasPlaceholder
 {
diff --git a/packages/forms/src/Fields/Date.php b/packages/forms/src/Fields/Date.php
index b0c704a5c2..27f9ee0955 100644
--- a/packages/forms/src/Fields/Date.php
+++ b/packages/forms/src/Fields/Date.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 
 class Date extends InputField
 {
diff --git a/packages/forms/src/Fields/DateTime.php b/packages/forms/src/Fields/DateTime.php
index 5ce97fabb1..4f0864d4fa 100644
--- a/packages/forms/src/Fields/DateTime.php
+++ b/packages/forms/src/Fields/DateTime.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
 class DateTime extends Date
 {
diff --git a/packages/forms/src/Fields/Field.php b/packages/forms/src/Fields/Field.php
index a888a4666d..51f959447a 100644
--- a/packages/forms/src/Fields/Field.php
+++ b/packages/forms/src/Fields/Field.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Form;
+use Filament\Forms\Form;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Tappable;
 
diff --git a/packages/forms/src/Fields/Fieldset.php b/packages/forms/src/Fields/Fieldset.php
index 9ba6f5a1a4..9cc5ad5a77 100644
--- a/packages/forms/src/Fields/Fieldset.php
+++ b/packages/forms/src/Fields/Fieldset.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
 use Illuminate\Support\Str;
 
diff --git a/packages/forms/src/Fields/File.php b/packages/forms/src/Fields/File.php
index 1a07b8b960..5cc8d589e7 100644
--- a/packages/forms/src/Fields/File.php
+++ b/packages/forms/src/Fields/File.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 use Illuminate\Support\Str;
 
 class File extends InputField
diff --git a/packages/forms/src/Fields/InputField.php b/packages/forms/src/Fields/InputField.php
index 95881d79d5..2a675e1b48 100644
--- a/packages/forms/src/Fields/InputField.php
+++ b/packages/forms/src/Fields/InputField.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
 use Illuminate\Support\Str;
 
diff --git a/packages/forms/src/Fields/RichEditor.php b/packages/forms/src/Fields/RichEditor.php
index 7a64620b73..49ac328ed4 100644
--- a/packages/forms/src/Fields/RichEditor.php
+++ b/packages/forms/src/Fields/RichEditor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 
 class RichEditor extends InputField
 {
diff --git a/packages/forms/src/Fields/Select.php b/packages/forms/src/Fields/Select.php
index 291796ce86..fbd3740ea8 100644
--- a/packages/forms/src/Fields/Select.php
+++ b/packages/forms/src/Fields/Select.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 
 class Select extends InputField
 {
diff --git a/packages/forms/src/Fields/Tab.php b/packages/forms/src/Fields/Tab.php
index 10caff0b23..66aaf717d3 100644
--- a/packages/forms/src/Fields/Tab.php
+++ b/packages/forms/src/Fields/Tab.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
 use Illuminate\Support\Str;
 
diff --git a/packages/forms/src/Fields/Tabs.php b/packages/forms/src/Fields/Tabs.php
index ff75e41e0a..073e20d6b6 100644
--- a/packages/forms/src/Fields/Tabs.php
+++ b/packages/forms/src/Fields/Tabs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
 use Illuminate\Support\Str;
 
diff --git a/packages/forms/src/Fields/Tags.php b/packages/forms/src/Fields/Tags.php
index e9cb81ffbf..e4a3e35959 100644
--- a/packages/forms/src/Fields/Tags.php
+++ b/packages/forms/src/Fields/Tags.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 
 class Tags extends InputField
 {
diff --git a/packages/forms/src/Fields/Text.php b/packages/forms/src/Fields/Text.php
index b850cd2ae7..b439dedfee 100644
--- a/packages/forms/src/Fields/Text.php
+++ b/packages/forms/src/Fields/Text.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 
 class Text extends InputField
 {
diff --git a/packages/forms/src/Fields/Textarea.php b/packages/forms/src/Fields/Textarea.php
index 48166eb8d5..396858906e 100644
--- a/packages/forms/src/Fields/Textarea.php
+++ b/packages/forms/src/Fields/Textarea.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Filament\Fields;
+namespace Filament\Forms\Fields;
 
-use Filament\Fields\Concerns;
+use Filament\Forms\Fields\Concerns;
 
 class Textarea extends InputField
 {
diff --git a/packages/forms/src/Form.php b/packages/forms/src/Form.php
index 403cf438ec..507d620c46 100644
--- a/packages/forms/src/Form.php
+++ b/packages/forms/src/Form.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament;
+namespace Filament\Forms;
 
 class Form
 {
diff --git a/packages/forms/src/FormsServiceProvider.php b/packages/forms/src/FormsServiceProvider.php
index 4956447955..e2c9dbe6be 100644
--- a/packages/forms/src/FormsServiceProvider.php
+++ b/packages/forms/src/FormsServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament;
+namespace Filament\Forms;
 
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
diff --git a/packages/forms/src/HasForm.php b/packages/forms/src/HasForm.php
index 5050620c8b..4250aa78d3 100644
--- a/packages/forms/src/HasForm.php
+++ b/packages/forms/src/HasForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament;
+namespace Filament\Forms;
 
 use Filament\Fields\File;
 use Filament\Fields\InputField;
diff --git a/packages/forms/src/Forms/Http/Controllers/RichEditorAttachmentController.php b/packages/forms/src/Http/Controllers/RichEditorAttachmentController.php
similarity index 100%
rename from packages/forms/src/Forms/Http/Controllers/RichEditorAttachmentController.php
rename to packages/forms/src/Http/Controllers/RichEditorAttachmentController.php
diff --git a/packages/tables/composer.json b/packages/tables/composer.json
index dbebadadf1..e82377e761 100644
--- a/packages/tables/composer.json
+++ b/packages/tables/composer.json
@@ -15,13 +15,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Filament\\": "src"
+            "Filament\\Tables\\": "src"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Filament\\TablesServiceProvider"
+                "Filament\\Tables\\TablesServiceProvider"
             ]
         }
     },
diff --git a/packages/tables/src/HasTable.php b/packages/tables/src/HasTable.php
index 5b30f67219..3c323c3170 100644
--- a/packages/tables/src/HasTable.php
+++ b/packages/tables/src/HasTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament;
+namespace Filament\Tables;
 
 trait HasTable
 {
diff --git a/packages/tables/src/Table.php b/packages/tables/src/Table.php
deleted file mode 100644
index dbaa2b0374..0000000000
--- a/packages/tables/src/Table.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Filament;
-
-class Table
-{
-    //
-}
diff --git a/packages/tables/src/TablesServiceProvider.php b/packages/tables/src/TablesServiceProvider.php
index 69594bd4d6..5a4cd7fcc3 100644
--- a/packages/tables/src/TablesServiceProvider.php
+++ b/packages/tables/src/TablesServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament;
+namespace Filament\Tables;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/src/Actions/CreateRecord.php b/src/Actions/CreateRecord.php
index bd14366b99..c6a5104247 100644
--- a/src/Actions/CreateRecord.php
+++ b/src/Actions/CreateRecord.php
@@ -3,7 +3,7 @@
 namespace Filament\Actions;
 
 use Filament\Actions\Concerns;
-use Filament\HasForm;
+use Filament\Forms\HasForm;
 use Livewire\Component;
 
 class CreateRecord extends Component
diff --git a/src/Actions/EditRecord.php b/src/Actions/EditRecord.php
index f375f6f5c6..c7f359368b 100644
--- a/src/Actions/EditRecord.php
+++ b/src/Actions/EditRecord.php
@@ -3,7 +3,7 @@
 namespace Filament\Actions;
 
 use Filament\Actions\Concerns;
-use Filament\HasForm;
+use Filament\Forms\HasForm;
 use Livewire\Component;
 
 class EditRecord extends Component
diff --git a/src/Actions/ListRecords.php b/src/Actions/ListRecords.php
index d4d3781844..5854342082 100644
--- a/src/Actions/ListRecords.php
+++ b/src/Actions/ListRecords.php
@@ -3,7 +3,7 @@
 namespace Filament\Actions;
 
 use Filament\Actions\Concerns;
-use Filament\HasTable;
+use Filament\Tables\HasTable;
 use Livewire\Component;
 
 class ListRecords extends Component
diff --git a/src/HasTable.php b/src/HasTable.php
deleted file mode 100644
index 5b30f67219..0000000000
--- a/src/HasTable.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Filament;
-
-trait HasTable
-{
-    //
-}
diff --git a/src/Http/Livewire/Auth/Login.php b/src/Http/Livewire/Auth/Login.php
index af3237ae8a..7fbe74e569 100644
--- a/src/Http/Livewire/Auth/Login.php
+++ b/src/Http/Livewire/Auth/Login.php
@@ -4,8 +4,8 @@ namespace Filament\Http\Livewire\Auth;
 
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Filament\Actions\Concerns;
-use Filament\Fields;
-use Filament\HasForm;
+use Filament\Forms\Fields;
+use Filament\Forms\HasForm;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
 
diff --git a/src/Http/Livewire/Auth/RequestPassword.php b/src/Http/Livewire/Auth/RequestPassword.php
index b700231232..e4e4123746 100644
--- a/src/Http/Livewire/Auth/RequestPassword.php
+++ b/src/Http/Livewire/Auth/RequestPassword.php
@@ -4,8 +4,8 @@ namespace Filament\Http\Livewire\Auth;
 
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
 use Filament\Actions\Concerns;
-use Filament\Fields;
-use Filament\HasForm;
+use Filament\Forms\Fields;
+use Filament\Forms\HasForm;
 use Illuminate\Support\Facades\Password;
 use Livewire\Component;
 
diff --git a/src/Http/Livewire/Auth/ResetPassword.php b/src/Http/Livewire/Auth/ResetPassword.php
index 18208f76bb..d339be0a58 100644
--- a/src/Http/Livewire/Auth/ResetPassword.php
+++ b/src/Http/Livewire/Auth/ResetPassword.php
@@ -2,8 +2,8 @@
 
 namespace Filament\Http\Livewire\Auth;
 
-use Filament\Fields;
-use Filament\HasForm;
+use Filament\Forms\Fields;
+use Filament\Forms\HasForm;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
diff --git a/src/Http/Livewire/EditAccount.php b/src/Http/Livewire/EditAccount.php
index 5e772e777d..8c1df0cd2d 100644
--- a/src/Http/Livewire/EditAccount.php
+++ b/src/Http/Livewire/EditAccount.php
@@ -3,9 +3,9 @@
 namespace Filament\Http\Livewire;
 
 use Filament\Actions\Concerns;
-use Filament\Fields;
-use Filament\Form;
-use Filament\HasForm;
+use Filament\Forms\Fields;
+use Filament\Forms\Form;
+use Filament\Forms\HasForm;
 use Filament\Models\FilamentUser;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 98308ed713..b5de5db231 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -35,8 +35,8 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
             \BladeUI\Heroicons\BladeHeroiconsServiceProvider::class,
             \BladeUI\Icons\BladeIconsServiceProvider::class,
             \Filament\FilamentServiceProvider::class,
-            \Filament\FormsServiceProvider::class,
-            \Filament\TablesServiceProvider::class,
+            \Filament\Forms\FormsServiceProvider::class,
+            \Filament\Tables\TablesServiceProvider::class,
             \Livewire\LivewireServiceProvider::class,
             \Thomaswelton\LaravelGravatar\LaravelGravatarServiceProvider::class,
             \Watson\Active\ActiveServiceProvider::class,