diff --git a/app/Livewire/Color/Index.php b/app/Livewire/Filament/Color.php
similarity index 73%
rename from app/Livewire/Color/Index.php
rename to app/Livewire/Filament/Color.php
index 9d7f4b8..d8f7232 100644
--- a/app/Livewire/Color/Index.php
+++ b/app/Livewire/Filament/Color.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Color;
+namespace App\Livewire\Filament;
 
 use Livewire\WithPagination;
 use Livewire\Attributes\Validate;
@@ -8,12 +8,14 @@ use Livewire\Component;
 use Livewire\Attributes\title;
 use Illuminate\Support\Facades\Auth;
 
-use App\Models\Color;
+use App\Models\Color as ColorModel;
+
 #[title('Colors')]
-class Index extends Component
+class Color extends Component
 {
     use WithPagination;
 
+    // Validation
     #[Validate('required')]
     public $name = '';
 
@@ -25,7 +27,7 @@ class Index extends Component
         $this->validate(); 
 
         // Create the color 
-        Color::create([
+        ColorModel::create([
             $this->all()
         ]);
 
@@ -39,8 +41,8 @@ class Index extends Component
     }
     public function render()
     {
-        return view('livewire.color.index', [
-            'colors' => Color::paginate(10)
+        return view('livewire.filament.color', [
+            'colors' => ColorModel::paginate(10)
         ]);
     }
 }
diff --git a/app/Livewire/Filament/Type.php b/app/Livewire/Filament/Type.php
new file mode 100644
index 0000000..b866485
--- /dev/null
+++ b/app/Livewire/Filament/Type.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire\Filament;
+
+use Livewire\Component;
+
+class Type extends Component
+{
+    public function render()
+    {
+        return view('livewire.filament.type');
+    }
+}
diff --git a/app/Livewire/Types/Index.php b/app/Livewire/Types/Index.php
deleted file mode 100644
index 59215bf..0000000
--- a/app/Livewire/Types/Index.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Livewire\Types;
-
-use Livewire\Component;
-use Livewire\Attributes\title;
-
-#[title('Types')]
-class Index extends Component
-{
-    public function render()
-    {
-        return view('livewire.types.index');
-    }
-}
diff --git a/resources/views/livewire/color/index.blade.php b/resources/views/livewire/filament/color.blade.php
similarity index 100%
rename from resources/views/livewire/color/index.blade.php
rename to resources/views/livewire/filament/color.blade.php
diff --git a/resources/views/livewire/filament/type.blade.php b/resources/views/livewire/filament/type.blade.php
new file mode 100644
index 0000000..cdda2ce
--- /dev/null
+++ b/resources/views/livewire/filament/type.blade.php
@@ -0,0 +1,3 @@
+<div>
+    {{-- In work, do what you enjoy. --}}
+</div>
diff --git a/resources/views/livewire/types/index.blade.php b/resources/views/livewire/types/index.blade.php
deleted file mode 100644
index a40248d..0000000
--- a/resources/views/livewire/types/index.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    {{-- Knowing others is intelligence; knowing yourself is true wisdom. --}}
-</div>
diff --git a/routes/web.php b/routes/web.php
index 4567b39..0b83e1b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,12 +2,12 @@
 
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\FilamentTypeController;
-use App\Http\Controllers\ColorController;
 use App\Http\Controllers\FilamentController;
 use App\Http\Controllers\ManufacturerController;
 
-use App\Livewire\Types\Index;
 use App\Livewire\Dashboard;
+use App\Livewire\Filament\Color;
+use App\Livewire\Filament\Type;
 
 Route::get('/', function () {
     return view('welcome');
@@ -21,15 +21,14 @@ Route::middleware([
 
     // Dashboard
     Route::get('/', Dashboard::class)->name('dashboard');
-    // Filament Types
-    Route::get('types', Index::class)->name('types.index');
     // Colors
-    Route::resource('colors', ColorController::class);
+    Route::get('colors', Color::class)->name('colors.index');
+    // Types
+    Route::get('types', Type::class)->name('types.index');
     // Filaments
     Route::resource('filaments', FilamentController::class);
     // Manufacturers
     Route::resource('manufacturers', ManufacturerController::class);
     Route::get('refresh', [ManufacturerController::class, 'refresh'])->name('refresh');
-   
-    Route::get('colors', Index::class)->name('colors.index');
+
 });