diff --git a/database/seeders/ProductCatalogFromImagesSeeder.php b/database/seeders/ProductCatalogFromImagesSeeder.php
index b3585c7..38a5e22 100644
--- a/database/seeders/ProductCatalogFromImagesSeeder.php
+++ b/database/seeders/ProductCatalogFromImagesSeeder.php
@@ -80,7 +80,7 @@ class ProductCatalogFromImagesSeeder extends Seeder
             throw new RuntimeException("Tenant 'sonder' not found.");
         }
 
-        $catalogPath = storage_path('public/catalog');
+        $catalogPath = public_path('images/catalog');
 
         if (! is_dir($catalogPath)) {
             throw new RuntimeException("Catalog directory not found at path: {$catalogPath}");
diff --git a/database/seeders/TenantSeeder.php b/database/seeders/TenantSeeder.php
index a41a149..0a32d45 100644
--- a/database/seeders/TenantSeeder.php
+++ b/database/seeders/TenantSeeder.php
@@ -56,34 +56,34 @@ class TenantSeeder extends Seeder
             'success_color' => '#198754',
             'header_bg_color' => '#ffffff',
             'footer_bg_color' => '#313131',
-            'header_logo' => $this->uploadedImage('images/sonder_header.png', 'sonder_header.png'),
-            'footer_logo' => $this->uploadedImage('images/sonder_footer.png', 'sonder_footer.png'),
+            'header_logo' => $this->uploadedImage('images/tennants/sonder/sonder_header.png', 'sonder_header.png'),
+            'footer_logo' => $this->uploadedImage('images/tennants/sonder/sonder_footer.png', 'sonder_footer.png'),
             'social_media' => self::SOCIAL_MEDIA,
             'website_type_code' => 'shopit',
             'extras' => [
                 'carousel' => [
                     $this->uploadedImage(
-                        'images/sonder-main-carousel/01-urban-team.png',
+                        'images/tennants/sonder/sonder-main-carousel/01-urban-team.png',
                         '01-urban-team.png',
                     ),
                     $this->uploadedImage(
-                        'images/sonder-main-carousel/02-running-shoes.png',
+                        'images/tennants/sonder/sonder-main-carousel/02-running-shoes.png',
                         '02-running-shoes.png',
                     ),
                     $this->uploadedImage(
-                        'images/sonder-main-carousel/03-streetwear.png',
+                        'images/tennants/sonder/sonder-main-carousel/03-streetwear.png',
                         '03-streetwear.png',
                     ),
                     $this->uploadedImage(
-                        'images/sonder-main-carousel/04-football-training.png',
+                        'images/tennants/sonder/sonder-main-carousel/04-football-training.png',
                         '04-football-training.png',
                     ),
                     $this->uploadedImage(
-                        'images/sonder-main-carousel/05-activewear-essentials.png',
+                        'images/tennants/sonder/sonder-main-carousel/05-activewear-essentials.png',
                         '05-activewear-essentials.png',
                     ),
                     $this->uploadedImage(
-                        'images/sonder-main-carousel/06-city-runners.png',
+                        'images/tennants/sonder/sonder-main-carousel/06-city-runners.png',
                         '06-city-runners.png',
                     ),
                 ],
@@ -108,11 +108,11 @@ class TenantSeeder extends Seeder
             'header_bg_color' => '#ffffff',
             'footer_bg_color' => '#015327',
             'header_logo' => $this->uploadedImage(
-                'images/futbol_infantil_header.png',
+                'images/tennants/fiesta_futbol_infantil/futbol_infantil_header.png',
                 'futbol_infantil_header.png',
             ),
             'footer_logo' => $this->uploadedImage(
-                'images/futbol_infantil_footer.png',
+                'images/tennants/fiesta_futbol_infantil/futbol_infantil_footer.png',
                 'futbol_infantil_footer.png',
             ),
             'social_media' => self::SOCIAL_MEDIA,
@@ -124,7 +124,7 @@ class TenantSeeder extends Seeder
                     'button_text' => 'Comprar entradas',
                     'button_href' => '/tickets',
                     'background_image_id' => $this->uploadedImage(
-                        'images/futbol_infantil_hero.jpg',
+                        'images/tennants/fiesta_futbol_infantil/futbol_infantil_hero.jpg',
                         'futbol_infantil_hero.jpg',
                     ),
                 ],
diff --git a/storage/public/catalog/buzo_blanco_adidas.jpg b/public/images/catalog/buzo_blanco_adidas.jpg
similarity index 100%
rename from storage/public/catalog/buzo_blanco_adidas.jpg
rename to public/images/catalog/buzo_blanco_adidas.jpg
diff --git a/storage/public/catalog/buzo_blanco_adidas_1.jpg b/public/images/catalog/buzo_blanco_adidas_1.jpg
similarity index 100%
rename from storage/public/catalog/buzo_blanco_adidas_1.jpg
rename to public/images/catalog/buzo_blanco_adidas_1.jpg
diff --git a/storage/public/catalog/buzo_gris_nije.jpg b/public/images/catalog/buzo_gris_nije.jpg
similarity index 100%
rename from storage/public/catalog/buzo_gris_nije.jpg
rename to public/images/catalog/buzo_gris_nije.jpg
diff --git a/storage/public/catalog/buzo_gris_nike_1.jpg b/public/images/catalog/buzo_gris_nike_1.jpg
similarity index 100%
rename from storage/public/catalog/buzo_gris_nike_1.jpg
rename to public/images/catalog/buzo_gris_nike_1.jpg
diff --git a/storage/public/catalog/buzo_gris_nike_2.jpg b/public/images/catalog/buzo_gris_nike_2.jpg
similarity index 100%
rename from storage/public/catalog/buzo_gris_nike_2.jpg
rename to public/images/catalog/buzo_gris_nike_2.jpg
diff --git a/storage/public/catalog/buzo_gris_under_armour.jpg b/public/images/catalog/buzo_gris_under_armour.jpg
similarity index 100%
rename from storage/public/catalog/buzo_gris_under_armour.jpg
rename to public/images/catalog/buzo_gris_under_armour.jpg
diff --git a/storage/public/catalog/buzo_negro_adidas.jpg b/public/images/catalog/buzo_negro_adidas.jpg
similarity index 100%
rename from storage/public/catalog/buzo_negro_adidas.jpg
rename to public/images/catalog/buzo_negro_adidas.jpg
diff --git a/storage/public/catalog/buzo_negro_adidas_1.jpg b/public/images/catalog/buzo_negro_adidas_1.jpg
similarity index 100%
rename from storage/public/catalog/buzo_negro_adidas_1.jpg
rename to public/images/catalog/buzo_negro_adidas_1.jpg
diff --git a/storage/public/catalog/camiseta_rosario_central.jpeg b/public/images/catalog/camiseta_rosario_central.jpeg
similarity index 100%
rename from storage/public/catalog/camiseta_rosario_central.jpeg
rename to public/images/catalog/camiseta_rosario_central.jpeg
diff --git a/storage/public/catalog/camiseta_rosario_central_1.png b/public/images/catalog/camiseta_rosario_central_1.png
similarity index 100%
rename from storage/public/catalog/camiseta_rosario_central_1.png
rename to public/images/catalog/camiseta_rosario_central_1.png
diff --git a/storage/public/catalog/pantalon_azul.png b/public/images/catalog/pantalon_azul.png
similarity index 100%
rename from storage/public/catalog/pantalon_azul.png
rename to public/images/catalog/pantalon_azul.png
diff --git a/storage/public/catalog/pantalon_blanco.png b/public/images/catalog/pantalon_blanco.png
similarity index 100%
rename from storage/public/catalog/pantalon_blanco.png
rename to public/images/catalog/pantalon_blanco.png
diff --git a/storage/public/catalog/pantalon_negro.jfif b/public/images/catalog/pantalon_negro.jfif
similarity index 100%
rename from storage/public/catalog/pantalon_negro.jfif
rename to public/images/catalog/pantalon_negro.jfif
diff --git a/storage/public/catalog/pantalon_negro.jpg b/public/images/catalog/pantalon_negro.jpg
similarity index 100%
rename from storage/public/catalog/pantalon_negro.jpg
rename to public/images/catalog/pantalon_negro.jpg
diff --git a/storage/public/catalog/pelota_mundial.webp b/public/images/catalog/pelota_mundial.webp
similarity index 100%
rename from storage/public/catalog/pelota_mundial.webp
rename to public/images/catalog/pelota_mundial.webp
diff --git a/storage/public/catalog/pelota_mundial_1.jpg b/public/images/catalog/pelota_mundial_1.jpg
similarity index 100%
rename from storage/public/catalog/pelota_mundial_1.jpg
rename to public/images/catalog/pelota_mundial_1.jpg
diff --git a/storage/public/catalog/remera_azul.webp b/public/images/catalog/remera_azul.webp
similarity index 100%
rename from storage/public/catalog/remera_azul.webp
rename to public/images/catalog/remera_azul.webp
diff --git a/storage/public/catalog/remera_blanca.jpg b/public/images/catalog/remera_blanca.jpg
similarity index 100%
rename from storage/public/catalog/remera_blanca.jpg
rename to public/images/catalog/remera_blanca.jpg
diff --git a/storage/public/catalog/remera_negra.jpg b/public/images/catalog/remera_negra.jpg
similarity index 100%
rename from storage/public/catalog/remera_negra.jpg
rename to public/images/catalog/remera_negra.jpg
diff --git a/storage/public/catalog/zapatillas_lecoq.webp b/public/images/catalog/zapatillas_lecoq.webp
similarity index 100%
rename from storage/public/catalog/zapatillas_lecoq.webp
rename to public/images/catalog/zapatillas_lecoq.webp
diff --git a/storage/public/catalog/zapatillas_lecoq_1.webp b/public/images/catalog/zapatillas_lecoq_1.webp
similarity index 100%
rename from storage/public/catalog/zapatillas_lecoq_1.webp
rename to public/images/catalog/zapatillas_lecoq_1.webp
diff --git a/storage/public/catalog/zapatillas_topper.webp b/public/images/catalog/zapatillas_topper.webp
similarity index 100%
rename from storage/public/catalog/zapatillas_topper.webp
rename to public/images/catalog/zapatillas_topper.webp
diff --git a/storage/public/catalog/zapatillas_topper_1.webp b/public/images/catalog/zapatillas_topper_1.webp
similarity index 100%
rename from storage/public/catalog/zapatillas_topper_1.webp
rename to public/images/catalog/zapatillas_topper_1.webp
diff --git a/public/images/futbol_infantil_footer.png b/public/images/tennants/fiesta_futbol_infantil/futbol_infantil_footer.png
similarity index 100%
rename from public/images/futbol_infantil_footer.png
rename to public/images/tennants/fiesta_futbol_infantil/futbol_infantil_footer.png
diff --git a/public/images/futbol_infantil_header.png b/public/images/tennants/fiesta_futbol_infantil/futbol_infantil_header.png
similarity index 100%
rename from public/images/futbol_infantil_header.png
rename to public/images/tennants/fiesta_futbol_infantil/futbol_infantil_header.png
diff --git a/public/images/futbol_infantil_hero.jpg b/public/images/tennants/fiesta_futbol_infantil/futbol_infantil_hero.jpg
similarity index 100%
rename from public/images/futbol_infantil_hero.jpg
rename to public/images/tennants/fiesta_futbol_infantil/futbol_infantil_hero.jpg
diff --git a/public/images/sonder-main-carousel/01-urban-team.png b/public/images/tennants/sonder/sonder-main-carousel/01-urban-team.png
similarity index 100%
rename from public/images/sonder-main-carousel/01-urban-team.png
rename to public/images/tennants/sonder/sonder-main-carousel/01-urban-team.png
diff --git a/public/images/sonder-main-carousel/02-running-shoes.png b/public/images/tennants/sonder/sonder-main-carousel/02-running-shoes.png
similarity index 100%
rename from public/images/sonder-main-carousel/02-running-shoes.png
rename to public/images/tennants/sonder/sonder-main-carousel/02-running-shoes.png
diff --git a/public/images/sonder-main-carousel/03-streetwear.png b/public/images/tennants/sonder/sonder-main-carousel/03-streetwear.png
similarity index 100%
rename from public/images/sonder-main-carousel/03-streetwear.png
rename to public/images/tennants/sonder/sonder-main-carousel/03-streetwear.png
diff --git a/public/images/sonder-main-carousel/04-football-training.png b/public/images/tennants/sonder/sonder-main-carousel/04-football-training.png
similarity index 100%
rename from public/images/sonder-main-carousel/04-football-training.png
rename to public/images/tennants/sonder/sonder-main-carousel/04-football-training.png
diff --git a/public/images/sonder-main-carousel/05-activewear-essentials.png b/public/images/tennants/sonder/sonder-main-carousel/05-activewear-essentials.png
similarity index 100%
rename from public/images/sonder-main-carousel/05-activewear-essentials.png
rename to public/images/tennants/sonder/sonder-main-carousel/05-activewear-essentials.png
diff --git a/public/images/sonder-main-carousel/06-city-runners.png b/public/images/tennants/sonder/sonder-main-carousel/06-city-runners.png
similarity index 100%
rename from public/images/sonder-main-carousel/06-city-runners.png
rename to public/images/tennants/sonder/sonder-main-carousel/06-city-runners.png
diff --git a/public/images/sonder_footer.png b/public/images/tennants/sonder/sonder_footer.png
similarity index 100%
rename from public/images/sonder_footer.png
rename to public/images/tennants/sonder/sonder_footer.png
diff --git a/public/images/sonder_header.png b/public/images/tennants/sonder/sonder_header.png
similarity index 100%
rename from public/images/sonder_header.png
rename to public/images/tennants/sonder/sonder_header.png
diff --git a/tests/Feature/Tenant/WebsiteTypeServiceTest.php b/tests/Feature/Tenant/WebsiteTypeServiceTest.php
new file mode 100644
index 0000000..f317d81
--- /dev/null
+++ b/tests/Feature/Tenant/WebsiteTypeServiceTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Feature\Tenant;
+
+use App\Domains\Tenant\Services\WebsiteTypeService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class WebsiteTypeServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_it_creates_a_website_type_and_uploads_its_logo_to_s3(): void
+    {
+        Storage::fake('s3');
+
+        $websiteType = app(WebsiteTypeService::class)->create([
+            'codigo' => 'marketplace',
+            'nombre' => 'Marketplace',
+            'primary_color' => '#111111',
+            'secondary_color' => '#222222',
+            'danger_color' => '#ff0000',
+            'success_color' => '#00aa55',
+            'site_logo' => UploadedFile::fake()->image('site-logo.png'),
+        ]);
+
+        $siteLogo = $websiteType->siteLogo()->firstOrFail();
+
+        $this->assertSame('marketplace', $websiteType->codigo);
+        $this->assertSame($siteLogo->id, $websiteType->site_logo);
+        $this->assertStringStartsWith('website-types/', $siteLogo->path);
+        Storage::disk('s3')->assertExists($siteLogo->path);
+        $this->assertDatabaseHas('website_type', [
+            'codigo' => 'marketplace',
+            'site_logo' => $siteLogo->id,
+        ]);
+    }
+}