From cb7d83978d7c311ba72d34383edb7446af9969e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Pe=CC=81ault?= <hello@flayks.com>
Date: Wed, 24 Jul 2024 10:59:34 +0200
Subject: [PATCH] chore: merge components and stylesheets in same directory
 name

---
 .../website/src/components/atoms/Badge.svelte |  22 ++-
 .../atoms/BoxCTA/BoxCTA.scss}                 |   0
 .../atoms/{ => BoxCTA}/BoxCTA.svelte          |   2 +-
 .../atoms/Button/Button.scss}                 |   0
 .../atoms/{ => Button}/Button.svelte          |   2 +-
 .../atoms/ButtonCart/ButtonCart.scss}         |   0
 .../atoms/{ => ButtonCart}/ButtonCart.svelte  |   4 +-
 .../atoms/ButtonCircle/ButtonCircle.scss}     |   0
 .../{ => ButtonCircle}/ButtonCircle.svelte    |   2 +-
 .../src/components/atoms/DiscoverText.svelte  |  21 ++-
 .../src/components/atoms/IconArrow.svelte     |  17 ++-
 .../atoms/SiteTitle/SiteTitle.scss}           |   0
 .../atoms/{ => SiteTitle}/SiteTitle.svelte    |   2 +-
 .../layouts/PosterLayout/PosterLayout.scss}   |   0
 .../{ => PosterLayout}/PosterLayout.svelte    |   6 +-
 .../molecules/CartItem/CartItem.scss}         |   0
 .../molecules/{ => CartItem}/CartItem.svelte  |   4 +-
 .../molecules/EmailForm/EmailForm.scss        | 125 ++++++++++++++++++
 .../{ => EmailForm}/EmailForm.svelte          |  10 +-
 .../components/molecules/Heading/Heading.scss |  50 +++++++
 .../molecules/{ => Heading}/Heading.svelte    |   4 +-
 .../molecules/House/House.scss}               |   0
 .../molecules/{ => House}/House.svelte        |   2 +-
 .../molecules/Location/Location.scss}         |   0
 .../molecules/{ => Location}/Location.svelte  |   2 +-
 .../NewsletterIssue/NewsletterIssue.scss}     |   0
 .../NewsletterIssue.svelte                    |   2 +-
 .../NotificationCart/NotificationCart.scss    |  61 +++++++++
 .../NotificationCart.svelte                   |   7 +-
 .../molecules/Pagination/Pagination.scss}     |   2 +-
 .../{ => Pagination}/Pagination.svelte        |   8 +-
 .../molecules/PhotoCard/PhotoCard.scss}       |   0
 .../{ => PhotoCard}/PhotoCard.svelte          |   2 +-
 .../molecules/PostCard/PostCard.scss}         |   0
 .../molecules/{ => PostCard}/PostCard.svelte  |   2 +-
 .../molecules/Poster/Poster.scss}             |  30 ++---
 .../molecules/{ => Poster}/Poster.svelte      |   4 +-
 .../molecules/ProcessStep/ProcessStep.scss    |  56 ++++++++
 .../{ => ProcessStep}/ProcessStep.svelte      |   2 +-
 .../ShopLocationSwitcher.scss                 |  45 +++++++
 .../ShopLocationSwitcher.svelte               |   2 +-
 .../molecules/Switcher/Switcher.scss}         |   0
 .../molecules/{ => Switcher}/Switcher.svelte  |   2 +-
 .../molecules/Toast/Toast.scss}               |   0
 .../molecules/{ => Toast}/Toast.svelte        |   4 +-
 .../organisms/Banner/Banner.scss}             |   0
 .../organisms/{ => Banner}/Banner.svelte      |   2 +-
 .../organisms/Carousel/Carousel.scss}         |   0
 .../organisms/{ => Carousel}/Carousel.svelte  |   2 +-
 .../organisms/Cart/Cart.scss}                 |   0
 .../organisms/{ => Cart}/Cart.svelte          |   8 +-
 .../organisms/Collage/Collage.scss}           |   0
 .../organisms/{ => Collage}/Collage.svelte    |   4 +-
 .../organisms/Footer/Footer.scss}             |   0
 .../organisms/{ => Footer}/Footer.svelte      |   4 +-
 .../InteractiveGlobe/InteractiveGlobe.scss}   |   0
 .../InteractiveGlobe.svelte                   |   2 +-
 .../organisms/Locations/Locations.scss}       |   0
 .../{ => Locations}/Locations.svelte          |   6 +-
 .../NewsletterModule/NewsletterModule.scss}   |   8 +-
 .../NewsletterModule.svelte                   |   4 +-
 .../organisms/PostersGrid/PostersGrid.scss}   |   0
 .../{ => PostersGrid}/PostersGrid.svelte      |   4 +-
 .../organisms/ShopBanner/ShopBanner.scss}     |   0
 .../{ => ShopBanner}/ShopBanner.svelte        |   6 +-
 .../organisms/ShopModule/ShopModule.scss}     |   0
 .../{ => ShopModule}/ShopModule.svelte        |   4 +-
 .../src/routes/(shop)/shop/+error.svelte      |   4 +-
 .../src/routes/(shop)/shop/+layout.svelte     |   4 +-
 .../src/routes/(shop)/shop/+page.svelte       |   6 +-
 .../(shop)/shop/[type]-[name]/+page.svelte    |   6 +-
 .../(site)/[country]/[location]/+page.svelte  |  10 +-
 .../[country]/[location]/[photo]/+page.svelte |   2 +-
 .../src/routes/(site)/about/+page.svelte      |   6 +-
 .../src/routes/(site)/credits/+page.svelte    |   4 +-
 .../src/routes/(site)/locations/+page.svelte  |  10 +-
 .../src/routes/(site)/photos/+page.svelte     |   8 +-
 .../src/routes/(site)/subscribe/+page.svelte  |   8 +-
 .../src/routes/(site)/terms/+page.svelte      |   2 +-
 apps/website/src/routes/+error.svelte         |  12 +-
 apps/website/src/routes/+layout.svelte        |   6 +-
 apps/website/src/routes/+page.svelte          |  14 +-
 apps/website/src/style/atoms/_arrow.scss      |  16 ---
 apps/website/src/style/atoms/_badge.scss      |  21 ---
 apps/website/src/style/atoms/_discover.scss   |  20 ---
 apps/website/src/style/global.scss            |   2 +-
 .../website/src/style/molecules/_heading.scss |  50 -------
 .../src/style/molecules/_newsletter-form.scss | 124 -----------------
 .../style/molecules/_notification-cart.scss   |  61 ---------
 .../src/style/molecules/_process-step.scss    |  56 --------
 .../molecules/_shop-locationswitcher.scss     |  45 -------
 apps/website/src/style/pages/_subscribe.scss  |   9 +-
 92 files changed, 533 insertions(+), 531 deletions(-)
 rename apps/website/src/{style/atoms/_box-cta.scss => components/atoms/BoxCTA/BoxCTA.scss} (100%)
 rename apps/website/src/components/atoms/{ => BoxCTA}/BoxCTA.svelte (90%)
 rename apps/website/src/{style/atoms/_button.scss => components/atoms/Button/Button.scss} (100%)
 rename apps/website/src/components/atoms/{ => Button}/Button.svelte (97%)
 rename apps/website/src/{style/atoms/_button-cart.scss => components/atoms/ButtonCart/ButtonCart.scss} (100%)
 rename apps/website/src/components/atoms/{ => ButtonCart}/ButtonCart.svelte (86%)
 rename apps/website/src/{style/atoms/_button-circle.scss => components/atoms/ButtonCircle/ButtonCircle.scss} (100%)
 rename apps/website/src/components/atoms/{ => ButtonCircle}/ButtonCircle.svelte (96%)
 rename apps/website/src/{style/atoms/_site-title.scss => components/atoms/SiteTitle/SiteTitle.scss} (100%)
 rename apps/website/src/components/atoms/{ => SiteTitle}/SiteTitle.svelte (95%)
 rename apps/website/src/{style/layouts/_poster.scss => components/layouts/PosterLayout/PosterLayout.scss} (100%)
 rename apps/website/src/components/layouts/{ => PosterLayout}/PosterLayout.svelte (95%)
 rename apps/website/src/{style/molecules/_cart-item.scss => components/molecules/CartItem/CartItem.scss} (100%)
 rename apps/website/src/components/molecules/{ => CartItem}/CartItem.svelte (94%)
 create mode 100644 apps/website/src/components/molecules/EmailForm/EmailForm.scss
 rename apps/website/src/components/molecules/{ => EmailForm}/EmailForm.svelte (92%)
 create mode 100644 apps/website/src/components/molecules/Heading/Heading.scss
 rename apps/website/src/components/molecules/{ => Heading}/Heading.svelte (67%)
 rename apps/website/src/{style/molecules/_house.scss => components/molecules/House/House.scss} (100%)
 rename apps/website/src/components/molecules/{ => House}/House.svelte (97%)
 rename apps/website/src/{style/molecules/_location.scss => components/molecules/Location/Location.scss} (100%)
 rename apps/website/src/components/molecules/{ => Location}/Location.svelte (98%)
 rename apps/website/src/{style/molecules/_issue.scss => components/molecules/NewsletterIssue/NewsletterIssue.scss} (100%)
 rename apps/website/src/components/molecules/{ => NewsletterIssue}/NewsletterIssue.svelte (95%)
 create mode 100644 apps/website/src/components/molecules/NotificationCart/NotificationCart.scss
 rename apps/website/src/components/molecules/{ => NotificationCart}/NotificationCart.svelte (82%)
 rename apps/website/src/{style/molecules/_pagination.scss => components/molecules/Pagination/Pagination.scss} (98%)
 rename apps/website/src/components/molecules/{ => Pagination}/Pagination.svelte (72%)
 rename apps/website/src/{style/molecules/_photo-card.scss => components/molecules/PhotoCard/PhotoCard.scss} (100%)
 rename apps/website/src/components/molecules/{ => PhotoCard}/PhotoCard.svelte (97%)
 rename apps/website/src/{style/organisms/_postcard.scss => components/molecules/PostCard/PostCard.scss} (100%)
 rename apps/website/src/components/molecules/{ => PostCard}/PostCard.svelte (96%)
 rename apps/website/src/{style/molecules/_poster.scss => components/molecules/Poster/Poster.scss} (99%)
 rename apps/website/src/components/molecules/{ => Poster}/Poster.svelte (92%)
 create mode 100644 apps/website/src/components/molecules/ProcessStep/ProcessStep.scss
 rename apps/website/src/components/molecules/{ => ProcessStep}/ProcessStep.svelte (96%)
 create mode 100644 apps/website/src/components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.scss
 rename apps/website/src/components/molecules/{ => ShopLocationSwitcher}/ShopLocationSwitcher.svelte (95%)
 rename apps/website/src/{style/molecules/_switcher.scss => components/molecules/Switcher/Switcher.scss} (100%)
 rename apps/website/src/components/molecules/{ => Switcher}/Switcher.svelte (97%)
 rename apps/website/src/{style/molecules/_toast.scss => components/molecules/Toast/Toast.scss} (100%)
 rename apps/website/src/components/molecules/{ => Toast}/Toast.svelte (96%)
 rename apps/website/src/{style/organisms/_banner.scss => components/organisms/Banner/Banner.scss} (100%)
 rename apps/website/src/components/organisms/{ => Banner}/Banner.svelte (96%)
 rename apps/website/src/{style/organisms/_carousel.scss => components/organisms/Carousel/Carousel.scss} (100%)
 rename apps/website/src/components/organisms/{ => Carousel}/Carousel.svelte (98%)
 rename apps/website/src/{style/organisms/_cart.scss => components/organisms/Cart/Cart.scss} (100%)
 rename apps/website/src/components/organisms/{ => Cart}/Cart.svelte (96%)
 rename apps/website/src/{style/organisms/_collage.scss => components/organisms/Collage/Collage.scss} (100%)
 rename apps/website/src/components/organisms/{ => Collage}/Collage.svelte (86%)
 rename apps/website/src/{style/organisms/_footer.scss => components/organisms/Footer/Footer.scss} (100%)
 rename apps/website/src/components/organisms/{ => Footer}/Footer.svelte (96%)
 rename apps/website/src/{style/modules/_globe.scss => components/organisms/InteractiveGlobe/InteractiveGlobe.scss} (100%)
 rename apps/website/src/components/organisms/{ => InteractiveGlobe}/InteractiveGlobe.svelte (99%)
 rename apps/website/src/{style/organisms/_locations.scss => components/organisms/Locations/Locations.scss} (100%)
 rename apps/website/src/components/organisms/{ => Locations}/Locations.svelte (94%)
 rename apps/website/src/{style/organisms/_newsletter.scss => components/organisms/NewsletterModule/NewsletterModule.scss} (90%)
 rename apps/website/src/components/organisms/{ => NewsletterModule}/NewsletterModule.svelte (83%)
 rename apps/website/src/{style/pages/shop/_posters.scss => components/organisms/PostersGrid/PostersGrid.scss} (100%)
 rename apps/website/src/components/organisms/{ => PostersGrid}/PostersGrid.svelte (96%)
 rename apps/website/src/{style/pages/shop/_banner.scss => components/organisms/ShopBanner/ShopBanner.scss} (100%)
 rename apps/website/src/components/organisms/{ => ShopBanner}/ShopBanner.svelte (96%)
 rename apps/website/src/{style/organisms/_shop.scss => components/organisms/ShopModule/ShopModule.scss} (100%)
 rename apps/website/src/components/organisms/{ => ShopModule}/ShopModule.svelte (96%)
 delete mode 100644 apps/website/src/style/atoms/_arrow.scss
 delete mode 100644 apps/website/src/style/atoms/_badge.scss
 delete mode 100644 apps/website/src/style/atoms/_discover.scss
 delete mode 100644 apps/website/src/style/molecules/_heading.scss
 delete mode 100644 apps/website/src/style/molecules/_newsletter-form.scss
 delete mode 100644 apps/website/src/style/molecules/_notification-cart.scss
 delete mode 100644 apps/website/src/style/molecules/_process-step.scss
 delete mode 100644 apps/website/src/style/molecules/_shop-locationswitcher.scss

diff --git a/apps/website/src/components/atoms/Badge.svelte b/apps/website/src/components/atoms/Badge.svelte
index 1ad95fd..be3c73a 100644
--- a/apps/website/src/components/atoms/Badge.svelte
+++ b/apps/website/src/components/atoms/Badge.svelte
@@ -1,5 +1,25 @@
 <style lang="scss">
-    @import "../../style/atoms/badge";
+    .badge {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 16px;
+        margin: 0 auto;
+        padding: 0 6px;
+        text-align: center;
+        background: $color-secondary-light;
+        font-weight: 500;
+        text-transform: uppercase;
+        letter-spacing: 1px;
+        line-height: 1;
+        color: $color-primary-darker;
+        border-radius: 100vh;
+
+        // Small size
+        &--small {
+            font-size: rem(7px);
+        }
+    }
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/atoms/_box-cta.scss b/apps/website/src/components/atoms/BoxCTA/BoxCTA.scss
similarity index 100%
rename from apps/website/src/style/atoms/_box-cta.scss
rename to apps/website/src/components/atoms/BoxCTA/BoxCTA.scss
diff --git a/apps/website/src/components/atoms/BoxCTA.svelte b/apps/website/src/components/atoms/BoxCTA/BoxCTA.svelte
similarity index 90%
rename from apps/website/src/components/atoms/BoxCTA.svelte
rename to apps/website/src/components/atoms/BoxCTA/BoxCTA.svelte
index f41cb8e..4b7d964 100644
--- a/apps/website/src/components/atoms/BoxCTA.svelte
+++ b/apps/website/src/components/atoms/BoxCTA/BoxCTA.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/atoms/box-cta";
+    @import "./BoxCTA";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/atoms/_button.scss b/apps/website/src/components/atoms/Button/Button.scss
similarity index 100%
rename from apps/website/src/style/atoms/_button.scss
rename to apps/website/src/components/atoms/Button/Button.scss
diff --git a/apps/website/src/components/atoms/Button.svelte b/apps/website/src/components/atoms/Button/Button.svelte
similarity index 97%
rename from apps/website/src/components/atoms/Button.svelte
rename to apps/website/src/components/atoms/Button/Button.svelte
index 038192e..91e6e8a 100644
--- a/apps/website/src/components/atoms/Button.svelte
+++ b/apps/website/src/components/atoms/Button/Button.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/atoms/button";
+    @import "./Button";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/atoms/_button-cart.scss b/apps/website/src/components/atoms/ButtonCart/ButtonCart.scss
similarity index 100%
rename from apps/website/src/style/atoms/_button-cart.scss
rename to apps/website/src/components/atoms/ButtonCart/ButtonCart.scss
diff --git a/apps/website/src/components/atoms/ButtonCart.svelte b/apps/website/src/components/atoms/ButtonCart/ButtonCart.svelte
similarity index 86%
rename from apps/website/src/components/atoms/ButtonCart.svelte
rename to apps/website/src/components/atoms/ButtonCart/ButtonCart.svelte
index d3763c2..d5afa54 100644
--- a/apps/website/src/components/atoms/ButtonCart.svelte
+++ b/apps/website/src/components/atoms/ButtonCart/ButtonCart.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/atoms/button-cart";
+    @import "./ButtonCart";
 </style>
 
 <script lang="ts">
@@ -9,7 +9,7 @@
     import { sendEvent } from '$utils/analytics'
     // Components
     import Icon from '$components/atoms/Icon.svelte'
-    import ButtonCircle from '$components/atoms/ButtonCircle.svelte'
+    import ButtonCircle from '$components/atoms/ButtonCircle/ButtonCircle.svelte'
 
     const openCart = () => {
         $cartOpen = true
diff --git a/apps/website/src/style/atoms/_button-circle.scss b/apps/website/src/components/atoms/ButtonCircle/ButtonCircle.scss
similarity index 100%
rename from apps/website/src/style/atoms/_button-circle.scss
rename to apps/website/src/components/atoms/ButtonCircle/ButtonCircle.scss
diff --git a/apps/website/src/components/atoms/ButtonCircle.svelte b/apps/website/src/components/atoms/ButtonCircle/ButtonCircle.svelte
similarity index 96%
rename from apps/website/src/components/atoms/ButtonCircle.svelte
rename to apps/website/src/components/atoms/ButtonCircle/ButtonCircle.svelte
index 827c3d0..9c3762a 100644
--- a/apps/website/src/components/atoms/ButtonCircle.svelte
+++ b/apps/website/src/components/atoms/ButtonCircle/ButtonCircle.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/atoms/button-circle";
+    @import "./ButtonCircle";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/components/atoms/DiscoverText.svelte b/apps/website/src/components/atoms/DiscoverText.svelte
index 23156a1..73ab50d 100644
--- a/apps/website/src/components/atoms/DiscoverText.svelte
+++ b/apps/website/src/components/atoms/DiscoverText.svelte
@@ -1,5 +1,24 @@
 <style lang="scss">
-    @import "../../style/atoms/discover";
+    .discover {
+        padding: 0 20px;
+        font-family: $font-sans;
+        font-size: rem(24px);
+        font-weight: 200;
+        line-height: 1.5;
+        color: $color-tertiary;
+
+        @include bp (sm) {
+            font-size: rem(28px);
+        }
+        @include bp (md) {
+            font-size: rem(32px);
+        }
+
+        strong {
+            color: $color-secondary;
+            font-weight: 200;
+        }
+    }
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/components/atoms/IconArrow.svelte b/apps/website/src/components/atoms/IconArrow.svelte
index 71ba346..0fb5ad0 100644
--- a/apps/website/src/components/atoms/IconArrow.svelte
+++ b/apps/website/src/components/atoms/IconArrow.svelte
@@ -1,5 +1,20 @@
 <style lang="scss">
-    @import "../../style/atoms/arrow";
+    .arrow {
+        display: block;
+
+        // Colors
+        &--white {
+            color: #fff;
+        }
+        &--pink {
+            color: $color-secondary;
+        }
+
+        // Variants
+        &--flip {
+            transform: rotate(180deg);
+        }
+    }
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/atoms/_site-title.scss b/apps/website/src/components/atoms/SiteTitle/SiteTitle.scss
similarity index 100%
rename from apps/website/src/style/atoms/_site-title.scss
rename to apps/website/src/components/atoms/SiteTitle/SiteTitle.scss
diff --git a/apps/website/src/components/atoms/SiteTitle.svelte b/apps/website/src/components/atoms/SiteTitle/SiteTitle.svelte
similarity index 95%
rename from apps/website/src/components/atoms/SiteTitle.svelte
rename to apps/website/src/components/atoms/SiteTitle/SiteTitle.svelte
index b2a347a..9c728e8 100644
--- a/apps/website/src/components/atoms/SiteTitle.svelte
+++ b/apps/website/src/components/atoms/SiteTitle/SiteTitle.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/atoms/site-title";
+    @import "./SiteTitle";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/layouts/_poster.scss b/apps/website/src/components/layouts/PosterLayout/PosterLayout.scss
similarity index 100%
rename from apps/website/src/style/layouts/_poster.scss
rename to apps/website/src/components/layouts/PosterLayout/PosterLayout.scss
diff --git a/apps/website/src/components/layouts/PosterLayout.svelte b/apps/website/src/components/layouts/PosterLayout/PosterLayout.svelte
similarity index 95%
rename from apps/website/src/components/layouts/PosterLayout.svelte
rename to apps/website/src/components/layouts/PosterLayout/PosterLayout.svelte
index 762a0dc..f57c63d 100644
--- a/apps/website/src/components/layouts/PosterLayout.svelte
+++ b/apps/website/src/components/layouts/PosterLayout/PosterLayout.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/layouts/poster";
+    @import "./PosterLayout";
 </style>
 
 <script lang="ts">
@@ -7,10 +7,10 @@
     import { capitalizeFirstLetter } from 'utils/string'
     // Components
     import SplitText from '$components/SplitText.svelte'
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import Image from '$components/atoms/Image.svelte'
     import ScrollingTitle from '$components/atoms/ScrollingTitle.svelte'
-    import Carousel from '$components/organisms/Carousel.svelte'
+    import Carousel from '$components/organisms/Carousel/Carousel.svelte'
 
     export let product: any
     export let shopProduct: any
diff --git a/apps/website/src/style/molecules/_cart-item.scss b/apps/website/src/components/molecules/CartItem/CartItem.scss
similarity index 100%
rename from apps/website/src/style/molecules/_cart-item.scss
rename to apps/website/src/components/molecules/CartItem/CartItem.scss
diff --git a/apps/website/src/components/molecules/CartItem.svelte b/apps/website/src/components/molecules/CartItem/CartItem.svelte
similarity index 94%
rename from apps/website/src/components/molecules/CartItem.svelte
rename to apps/website/src/components/molecules/CartItem/CartItem.svelte
index 7a77455..3e1b749 100644
--- a/apps/website/src/components/molecules/CartItem.svelte
+++ b/apps/website/src/components/molecules/CartItem/CartItem.svelte
@@ -1,11 +1,11 @@
 <style lang="scss">
-    @import "../../style/molecules/cart-item";
+    @import "./CartItem";
 </style>
 
 <script lang="ts">
     import { createEventDispatcher } from 'svelte'
     // Components
-    import ButtonCircle from '$components/atoms/ButtonCircle.svelte'
+    import ButtonCircle from '$components/atoms/ButtonCircle/ButtonCircle.svelte'
     import Select from '$components/molecules/Select.svelte'
 
     export let item: any
diff --git a/apps/website/src/components/molecules/EmailForm/EmailForm.scss b/apps/website/src/components/molecules/EmailForm/EmailForm.scss
new file mode 100644
index 0000000..bf7f863
--- /dev/null
+++ b/apps/website/src/components/molecules/EmailForm/EmailForm.scss
@@ -0,0 +1,125 @@
+// Email Form
+.newsletter-form {
+    position: relative;
+}
+
+.email {
+    position: relative;
+    width: 100%;
+    max-width: 600px;
+    height: 56px;
+    margin-bottom: 20px;
+    padding: 0 24px;
+    border-radius: 100vh;
+    box-shadow: inset 0 0 0 2px $color-secondary;
+    transition: box-shadow 0.6s var(--ease-quart);
+
+    @include bp (sm) {
+        height: 64px;
+        padding: 0 30px;
+    }
+
+    input {
+        display: block;
+        width: 100%;
+        height: 100%;
+        font-size: rem(16px);
+        font-family: $font-sans;
+        font-weight: 300;
+        color: $color-tertiary;
+        background: none;
+        border: none;
+
+        @include bp (sm) {
+            font-size: rem(18px);
+        }
+
+        &::placeholder {
+            color: rgba($color-tertiary, 0.6);
+            opacity: 1;
+        }
+    }
+    :global(button) {
+        position: absolute !important;
+        right: 16px;
+        top: 50%;
+        transform: translateY(-50%);
+        margin-left: 32px;
+        flex-shrink: 0;
+    }
+
+    // States
+    &.is-focused, &:hover {
+        box-shadow: inset 0 0 0 4px $color-secondary;
+    }
+}
+
+// Bottom details
+.bottom {
+    display: block;
+    text-align: center;
+    font-size: rem(14px);
+    max-width: 600px;
+
+    @include bp (sm) {
+        display: flex;
+        justify-content: center;
+        font-size: rem(16px);
+    }
+
+    .past-issues {
+        display: inline-flex;
+        align-items: center;
+        margin: 0 auto auto 0;
+        text-decoration: none;
+        color: $color-text;
+
+        &, span {
+            transition: color 0.2s, border-color 0.2s;
+        }
+        span {
+            display: block;
+            padding-bottom: 2px;
+            font-size: rem(14px);
+            color: $color-text;
+            margin-left: 8px;
+            border-bottom: 1px solid $color-text;
+
+            @include bp (sm) {
+                margin-left: 12px;
+                padding-bottom: 0;
+                font-size: rem(16px);
+            }
+        }
+    }
+    p {
+        color: $color-gray;
+        line-height: 1.3;
+        margin-top: 16px;
+        margin-bottom: 0;
+
+        @include bp (sm) {
+            margin-top: 0;
+        }
+    }
+}
+
+// Message
+.message {
+    padding: 24px;
+    text-align: center;
+    border-radius: 8px;
+
+    &.is-error {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        color: #fff;
+        background: $color-secondary;
+    }
+    &.is-success {
+        color: $color-text;
+        background: $color-tertiary;
+    }
+}
diff --git a/apps/website/src/components/molecules/EmailForm.svelte b/apps/website/src/components/molecules/EmailForm/EmailForm.svelte
similarity index 92%
rename from apps/website/src/components/molecules/EmailForm.svelte
rename to apps/website/src/components/molecules/EmailForm/EmailForm.svelte
index d0190dc..d7e1179 100644
--- a/apps/website/src/components/molecules/EmailForm.svelte
+++ b/apps/website/src/components/molecules/EmailForm/EmailForm.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/newsletter-form";
+    @import "./EmailForm";
 </style>
 
 <script lang="ts">
@@ -8,7 +8,7 @@
     import { sendEvent } from '$utils/analytics'
     // Components
     import IconArrow from '$components/atoms/IconArrow.svelte'
-    import ButtonCircle from '$components/atoms/ButtonCircle.svelte'
+    import ButtonCircle from '$components/atoms/ButtonCircle/ButtonCircle.svelte'
 
     export let past = false
 
@@ -64,7 +64,7 @@
         <form method="POST" action="/api/newsletter" on:submit|preventDefault={handleForm}
             out:fly|local={{ y: -8, easing: quartOut, duration: 600 }}
         >
-            <div class="newsletter-form__email" class:is-focused={inputInFocus}>
+            <div class="email" class:is-focused={inputInFocus}>
                 <input type="email" placeholder="Your email address" name="email" id="newsletter_email" required
                     on:focus={toggleFocus}
                     on:blur={toggleFocus}
@@ -79,7 +79,7 @@
                 </ButtonCircle>
             </div>
 
-            <div class="newsletter-form__bottom">
+            <div class="bottom">
                 {#if past}
                     <a href="/subscribe" class="past-issues" data-sveltekit-noscroll>
                         <svg width="20" height="16" viewBox="0 0 20 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" aria-label="Newsletter icon">
@@ -94,7 +94,7 @@
     {/if}
 
     {#if formStatus && formStatus.message}
-        <div class="newsletter-form__message shadow-small"
+        <div class="message shadow-small"
             class:is-error={!isSuccess}
             class:is-success={isSuccess}
             in:fly|local={{ y: 8, easing: quartOut, duration: 600, delay: isSuccess ? 600 : 0 }}
diff --git a/apps/website/src/components/molecules/Heading/Heading.scss b/apps/website/src/components/molecules/Heading/Heading.scss
new file mode 100644
index 0000000..bc2eae6
--- /dev/null
+++ b/apps/website/src/components/molecules/Heading/Heading.scss
@@ -0,0 +1,50 @@
+.heading {
+    overflow: hidden;
+    margin-bottom: 72px;
+    text-align: center;
+    color: $color-tertiary;
+
+    @include bp (sm) {
+        margin-bottom: clamp(72px, 8vw, 128px);
+    }
+
+    // Title
+    :global(h1) {
+        margin-top: 56px;
+        line-height: 1;
+        color: $color-secondary;
+
+        @include bp (sm) {
+            margin-top: clamp(80px, 9vw, 160px);
+        }
+    }
+}
+
+// Text
+.text {
+    width: 75%;
+    max-width: 360px;
+    margin: 40px auto 0;
+    font-weight: 200;
+
+    @include bp (sm) {
+        max-width: 600px;
+        margin-top: 72px;
+    }
+
+    :global(a) {
+        position: relative;
+        color: currentColor;
+        text-decoration: none;
+        display: inline-block;
+        background-image: linear-gradient(rgba($color-tertiary, 0.3), rgba($color-tertiary, 0.3));
+        background-position: 0 100%;
+        background-size: 100% 1px;
+        background-repeat: no-repeat;
+        transition: color 0.4s var(--ease-quart);
+
+        &:hover {
+            color: $color-secondary-light;
+        }
+    }
+}
diff --git a/apps/website/src/components/molecules/Heading.svelte b/apps/website/src/components/molecules/Heading/Heading.svelte
similarity index 67%
rename from apps/website/src/components/molecules/Heading.svelte
rename to apps/website/src/components/molecules/Heading/Heading.svelte
index ff1888d..9c37139 100644
--- a/apps/website/src/components/molecules/Heading.svelte
+++ b/apps/website/src/components/molecules/Heading/Heading.svelte
@@ -1,9 +1,9 @@
 <style lang="scss">
-    @import "../../style/molecules/heading";
+    @import "./Heading";
 </style>
 
 <script lang="ts">
-    import SiteTitle from '$components/atoms/SiteTitle.svelte'
+    import SiteTitle from '$components/atoms/SiteTitle/SiteTitle.svelte'
 
     export let text: string
 </script>
diff --git a/apps/website/src/style/molecules/_house.scss b/apps/website/src/components/molecules/House/House.scss
similarity index 100%
rename from apps/website/src/style/molecules/_house.scss
rename to apps/website/src/components/molecules/House/House.scss
diff --git a/apps/website/src/components/molecules/House.svelte b/apps/website/src/components/molecules/House/House.svelte
similarity index 97%
rename from apps/website/src/components/molecules/House.svelte
rename to apps/website/src/components/molecules/House/House.svelte
index f7c977f..8722955 100644
--- a/apps/website/src/components/molecules/House.svelte
+++ b/apps/website/src/components/molecules/House/House.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/house";
+    @import "./House";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/molecules/_location.scss b/apps/website/src/components/molecules/Location/Location.scss
similarity index 100%
rename from apps/website/src/style/molecules/_location.scss
rename to apps/website/src/components/molecules/Location/Location.scss
diff --git a/apps/website/src/components/molecules/Location.svelte b/apps/website/src/components/molecules/Location/Location.svelte
similarity index 98%
rename from apps/website/src/components/molecules/Location.svelte
rename to apps/website/src/components/molecules/Location/Location.svelte
index 1d2a6f6..5b6728c 100644
--- a/apps/website/src/components/molecules/Location.svelte
+++ b/apps/website/src/components/molecules/Location/Location.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/location";
+    @import "./Location";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/molecules/_issue.scss b/apps/website/src/components/molecules/NewsletterIssue/NewsletterIssue.scss
similarity index 100%
rename from apps/website/src/style/molecules/_issue.scss
rename to apps/website/src/components/molecules/NewsletterIssue/NewsletterIssue.scss
diff --git a/apps/website/src/components/molecules/NewsletterIssue.svelte b/apps/website/src/components/molecules/NewsletterIssue/NewsletterIssue.svelte
similarity index 95%
rename from apps/website/src/components/molecules/NewsletterIssue.svelte
rename to apps/website/src/components/molecules/NewsletterIssue/NewsletterIssue.svelte
index a0d3fc8..a337176 100644
--- a/apps/website/src/components/molecules/NewsletterIssue.svelte
+++ b/apps/website/src/components/molecules/NewsletterIssue/NewsletterIssue.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/issue";
+    @import "./NewsletterIssue";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/components/molecules/NotificationCart/NotificationCart.scss b/apps/website/src/components/molecules/NotificationCart/NotificationCart.scss
new file mode 100644
index 0000000..a792967
--- /dev/null
+++ b/apps/website/src/components/molecules/NotificationCart/NotificationCart.scss
@@ -0,0 +1,61 @@
+.notification-cart {
+    display: flex;
+    background-color: #fff;
+    color: $color-gray;
+    border-radius: 6px;
+    align-items: center;
+    overflow: hidden;
+    cursor: pointer;
+    pointer-events: auto;
+}
+
+// Left Image
+.left {
+    margin-right: 20px;
+    width: 100px;
+    height: 150px;
+
+    @include bp (sm) {
+        margin-right: 24px;
+        width: 58px;
+        height: 88px;
+    }
+
+    img {
+        display: block;
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+    }
+}
+
+// Details
+.right {
+    display: flex;
+    flex-direction: column;
+    margin-right: 24px;
+    justify-content: center;
+
+    // Poster Title
+    h3 {
+        font-family: $font-serif;
+        color: $color-secondary;
+        font-size: rem(20px);
+
+        @include bp (sm) {
+            font-size: rem(18px);
+        }
+    }
+    // Text
+    p {
+        font-size: rem(12px);
+        line-height: 1.4;
+        max-width: 124px;
+        margin: 4px 0;
+
+        @include bp (sm) {
+            font-size: rem(13px);
+            max-width: none;
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/website/src/components/molecules/NotificationCart.svelte b/apps/website/src/components/molecules/NotificationCart/NotificationCart.svelte
similarity index 82%
rename from apps/website/src/components/molecules/NotificationCart.svelte
rename to apps/website/src/components/molecules/NotificationCart/NotificationCart.svelte
index 1403ec4..660193f 100644
--- a/apps/website/src/components/molecules/NotificationCart.svelte
+++ b/apps/website/src/components/molecules/NotificationCart/NotificationCart.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/notification-cart";
+    @import "./NotificationCart";
 </style>
 
 <script lang="ts">
@@ -22,11 +22,12 @@
     transition:fly={{ y: 20, duration: 700, easing: quartOut }}
     on:click={closeNotification}
     on:keydown
+    role="presentation"
 >
-    <div class="notification-cart__left">
+    <div class="left">
         <img src={image} width={58} height={88} alt={title}>
     </div>
-    <div class="notification-cart__right">
+    <div class="right">
         <h3>{title}</h3>
         <p>{name}</p>
     </div>
diff --git a/apps/website/src/style/molecules/_pagination.scss b/apps/website/src/components/molecules/Pagination/Pagination.scss
similarity index 98%
rename from apps/website/src/style/molecules/_pagination.scss
rename to apps/website/src/components/molecules/Pagination/Pagination.scss
index 44990b2..48b2ca2 100644
--- a/apps/website/src/style/molecules/_pagination.scss
+++ b/apps/website/src/components/molecules/Pagination/Pagination.scss
@@ -5,7 +5,7 @@
     margin: auto 0;
     cursor: pointer;
 
-    &[disabled] {
+    &.is-disabled {
         cursor: not-allowed;
     }
 
diff --git a/apps/website/src/components/molecules/Pagination.svelte b/apps/website/src/components/molecules/Pagination/Pagination.svelte
similarity index 72%
rename from apps/website/src/components/molecules/Pagination.svelte
rename to apps/website/src/components/molecules/Pagination/Pagination.svelte
index de5c70c..b27c937 100644
--- a/apps/website/src/components/molecules/Pagination.svelte
+++ b/apps/website/src/components/molecules/Pagination/Pagination.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/pagination";
+    @import "./Pagination";
 </style>
 
 <script lang="ts">
@@ -8,8 +8,10 @@
     export let total: number
 </script>
 
-<div class="pagination" role="button" tabindex="0"
-    disabled={ended ? ended : undefined}
+<div
+    class="pagination"
+    class:is-disabled={ended ? ended : undefined}
+    role="button" tabindex="0"
     on:click
     on:keydown
 >
diff --git a/apps/website/src/style/molecules/_photo-card.scss b/apps/website/src/components/molecules/PhotoCard/PhotoCard.scss
similarity index 100%
rename from apps/website/src/style/molecules/_photo-card.scss
rename to apps/website/src/components/molecules/PhotoCard/PhotoCard.scss
diff --git a/apps/website/src/components/molecules/PhotoCard.svelte b/apps/website/src/components/molecules/PhotoCard/PhotoCard.svelte
similarity index 97%
rename from apps/website/src/components/molecules/PhotoCard.svelte
rename to apps/website/src/components/molecules/PhotoCard/PhotoCard.svelte
index dc4e1ef..2d4cc56 100644
--- a/apps/website/src/components/molecules/PhotoCard.svelte
+++ b/apps/website/src/components/molecules/PhotoCard/PhotoCard.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/photo-card";
+    @import "./PhotoCard";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/organisms/_postcard.scss b/apps/website/src/components/molecules/PostCard/PostCard.scss
similarity index 100%
rename from apps/website/src/style/organisms/_postcard.scss
rename to apps/website/src/components/molecules/PostCard/PostCard.scss
diff --git a/apps/website/src/components/molecules/PostCard.svelte b/apps/website/src/components/molecules/PostCard/PostCard.svelte
similarity index 96%
rename from apps/website/src/components/molecules/PostCard.svelte
rename to apps/website/src/components/molecules/PostCard/PostCard.svelte
index 3ad1452..100c979 100644
--- a/apps/website/src/components/molecules/PostCard.svelte
+++ b/apps/website/src/components/molecules/PostCard/PostCard.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/organisms/postcard";
+    @import "./PostCard";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/molecules/_poster.scss b/apps/website/src/components/molecules/Poster/Poster.scss
similarity index 99%
rename from apps/website/src/style/molecules/_poster.scss
rename to apps/website/src/components/molecules/Poster/Poster.scss
index 282d78a..13949e2 100644
--- a/apps/website/src/style/molecules/_poster.scss
+++ b/apps/website/src/components/molecules/Poster/Poster.scss
@@ -30,6 +30,20 @@
         transition: transform 0.8s var(--ease-quart), border-radius 0.8s var(--ease-quart);
     }
 
+    // Hover effect
+    &:hover {
+        :global(img) {
+            @include bp (md) {
+                transform: scale(0.8) translate3d(0, -5%, 0);
+                border-radius: 8px;
+            }
+        }
+        .buttons {
+            transform: translate3d(0,0,0);
+        }
+    }
+}
+
     // Buttons
     .buttons {
         display: flex;
@@ -84,18 +98,4 @@
                 }
             }
         }
-    }
-
-    // Hover effect
-    &:hover {
-        :global(img) {
-            @include bp (md) {
-                transform: scale(0.8) translate3d(0, -5%, 0);
-                border-radius: 8px;
-            }
-        }
-        .buttons {
-            transform: translate3d(0,0,0);
-        }
-    }
-}
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/apps/website/src/components/molecules/Poster.svelte b/apps/website/src/components/molecules/Poster/Poster.svelte
similarity index 92%
rename from apps/website/src/components/molecules/Poster.svelte
rename to apps/website/src/components/molecules/Poster/Poster.svelte
index 71b7174..2fe943e 100644
--- a/apps/website/src/components/molecules/Poster.svelte
+++ b/apps/website/src/components/molecules/Poster/Poster.svelte
@@ -1,12 +1,12 @@
 <style lang="scss">
-    @import "../../style/molecules/poster";
+    @import "./Poster";
 </style>
 
 <script lang="ts">
     import { addToCart } from '$utils/functions/shop'
     import { smoothScroll } from '$utils/stores'
     // Components
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import Image from '$components/atoms/Image.svelte'
 
     export let product: any
diff --git a/apps/website/src/components/molecules/ProcessStep/ProcessStep.scss b/apps/website/src/components/molecules/ProcessStep/ProcessStep.scss
new file mode 100644
index 0000000..9d9e90c
--- /dev/null
+++ b/apps/website/src/components/molecules/ProcessStep/ProcessStep.scss
@@ -0,0 +1,56 @@
+// About page Step
+.step {
+    position: relative;
+    display: block;
+    overflow: hidden;
+    padding: 32px;
+    background: $color-primary-darker;
+    border-radius: 12px;
+    transform: translateZ(0);
+
+    @include bp (sm) {
+        --columns: 11;
+        display: grid;
+        grid-template-rows: repeat(2, 1fr);
+        padding: 8% 0;
+        min-height: clamp(400px, 75vh, 800px);
+        border-radius: 16px;
+    }
+}
+
+// Image
+.media {
+    position: relative;
+    z-index: 2;
+    display: block;
+    overflow: hidden;
+    width: 70%;
+    max-height: 550px;
+    margin-bottom: 28px;
+    border-radius: 6px;
+
+    @include bp (sm) {
+        grid-column: 2 / span 6;
+        grid-row: 1 / -1;
+        width: 100%;
+        height: auto;
+        margin-bottom: 48px;
+    }
+
+    :global(.image img), video {
+        display: block;
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+    }
+}
+
+// Content
+.text {
+    position: relative;
+    z-index: 2;
+    line-height: 1.5;
+    font-weight: 300;
+    color: $color-secondary-light;
+    grid-column: 2 / -2;
+}
diff --git a/apps/website/src/components/molecules/ProcessStep.svelte b/apps/website/src/components/molecules/ProcessStep/ProcessStep.svelte
similarity index 96%
rename from apps/website/src/components/molecules/ProcessStep.svelte
rename to apps/website/src/components/molecules/ProcessStep/ProcessStep.svelte
index f54b28e..21c5299 100644
--- a/apps/website/src/components/molecules/ProcessStep.svelte
+++ b/apps/website/src/components/molecules/ProcessStep/ProcessStep.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/process-step";
+    @import "./ProcessStep";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.scss b/apps/website/src/components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.scss
new file mode 100644
index 0000000..129c89a
--- /dev/null
+++ b/apps/website/src/components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.scss
@@ -0,0 +1,45 @@
+.shop-locationswitcher {
+    pointer-events: auto;
+
+    // Overlaid
+    &.is-over {
+        dt {
+            color: #fff;
+        }
+    }
+}
+
+dt {
+    color: $color-primary;
+    font-weight: 400;
+    line-height: 1;
+    font-size: rem(12px);
+}
+dd {
+    color: $color-secondary;
+
+    svg {
+        display: inline-block;
+        width: 14px;
+        height: 14px;
+        margin-right: 4px;
+
+        @include bp (sm) {
+            width: 18px;
+            height: 18px;
+        }
+    }
+    select {
+        background: none;
+        border: none;
+        font-size: rem(18px);
+        color: $color-secondary;
+        font-family: $font-serif;
+        cursor: pointer;
+        appearance: none;
+
+        @include bp (sm) {
+            font-size: rem(24px);
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/website/src/components/molecules/ShopLocationSwitcher.svelte b/apps/website/src/components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.svelte
similarity index 95%
rename from apps/website/src/components/molecules/ShopLocationSwitcher.svelte
rename to apps/website/src/components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.svelte
index 14803ff..3a9bf64 100644
--- a/apps/website/src/components/molecules/ShopLocationSwitcher.svelte
+++ b/apps/website/src/components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/shop-locationswitcher";
+    @import "./ShopLocationSwitcher";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/molecules/_switcher.scss b/apps/website/src/components/molecules/Switcher/Switcher.scss
similarity index 100%
rename from apps/website/src/style/molecules/_switcher.scss
rename to apps/website/src/components/molecules/Switcher/Switcher.scss
diff --git a/apps/website/src/components/molecules/Switcher.svelte b/apps/website/src/components/molecules/Switcher/Switcher.svelte
similarity index 97%
rename from apps/website/src/components/molecules/Switcher.svelte
rename to apps/website/src/components/molecules/Switcher/Switcher.svelte
index 2037f65..7d027b1 100644
--- a/apps/website/src/components/molecules/Switcher.svelte
+++ b/apps/website/src/components/molecules/Switcher/Switcher.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/switcher";
+    @import "./Switcher";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/molecules/_toast.scss b/apps/website/src/components/molecules/Toast/Toast.scss
similarity index 100%
rename from apps/website/src/style/molecules/_toast.scss
rename to apps/website/src/components/molecules/Toast/Toast.scss
diff --git a/apps/website/src/components/molecules/Toast.svelte b/apps/website/src/components/molecules/Toast/Toast.svelte
similarity index 96%
rename from apps/website/src/components/molecules/Toast.svelte
rename to apps/website/src/components/molecules/Toast/Toast.svelte
index c8dbbe8..51e4e35 100644
--- a/apps/website/src/components/molecules/Toast.svelte
+++ b/apps/website/src/components/molecules/Toast/Toast.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/molecules/toast";
+    @import "./Toast";
 </style>
 
 <script lang="ts">
@@ -9,7 +9,7 @@
     import { browser } from '$app/environment'
     import { cx } from 'classix'
     // Components
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import Image from '$components/atoms/Image.svelte'
 
     export let id: string
diff --git a/apps/website/src/style/organisms/_banner.scss b/apps/website/src/components/organisms/Banner/Banner.scss
similarity index 100%
rename from apps/website/src/style/organisms/_banner.scss
rename to apps/website/src/components/organisms/Banner/Banner.scss
diff --git a/apps/website/src/components/organisms/Banner.svelte b/apps/website/src/components/organisms/Banner/Banner.svelte
similarity index 96%
rename from apps/website/src/components/organisms/Banner.svelte
rename to apps/website/src/components/organisms/Banner/Banner.svelte
index e70f397..44bffd6 100644
--- a/apps/website/src/components/organisms/Banner.svelte
+++ b/apps/website/src/components/organisms/Banner/Banner.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/organisms/banner";
+    @import "./Banner";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/organisms/_carousel.scss b/apps/website/src/components/organisms/Carousel/Carousel.scss
similarity index 100%
rename from apps/website/src/style/organisms/_carousel.scss
rename to apps/website/src/components/organisms/Carousel/Carousel.scss
diff --git a/apps/website/src/components/organisms/Carousel.svelte b/apps/website/src/components/organisms/Carousel/Carousel.svelte
similarity index 98%
rename from apps/website/src/components/organisms/Carousel.svelte
rename to apps/website/src/components/organisms/Carousel/Carousel.svelte
index 909aac8..7dcd979 100644
--- a/apps/website/src/components/organisms/Carousel.svelte
+++ b/apps/website/src/components/organisms/Carousel/Carousel.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/organisms/carousel";
+    @import "./Carousel";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/organisms/_cart.scss b/apps/website/src/components/organisms/Cart/Cart.scss
similarity index 100%
rename from apps/website/src/style/organisms/_cart.scss
rename to apps/website/src/components/organisms/Cart/Cart.scss
diff --git a/apps/website/src/components/organisms/Cart.svelte b/apps/website/src/components/organisms/Cart/Cart.svelte
similarity index 96%
rename from apps/website/src/components/organisms/Cart.svelte
rename to apps/website/src/components/organisms/Cart/Cart.svelte
index 792fbe7..0901cc4 100644
--- a/apps/website/src/components/organisms/Cart.svelte
+++ b/apps/website/src/components/organisms/Cart/Cart.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/organisms/cart";
+    @import "./Cart";
 </style>
 
 <script lang="ts">
@@ -12,10 +12,10 @@
     import { initSwell, getCart, updateCartItem, removeCartItem } from '$utils/functions/shop'
     import { sendEvent } from '$utils/analytics'
     // Components
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import Icon from '$components/atoms/Icon.svelte'
-    import CartItem from '$components/molecules/CartItem.svelte'
-    import ShopLocationSwitcher from '$components/molecules/ShopLocationSwitcher.svelte'
+    import CartItem from '$components/molecules/CartItem/CartItem.svelte'
+    import ShopLocationSwitcher from '$components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.svelte'
 
 
     // Block scroll if cart is open
diff --git a/apps/website/src/style/organisms/_collage.scss b/apps/website/src/components/organisms/Collage/Collage.scss
similarity index 100%
rename from apps/website/src/style/organisms/_collage.scss
rename to apps/website/src/components/organisms/Collage/Collage.scss
diff --git a/apps/website/src/components/organisms/Collage.svelte b/apps/website/src/components/organisms/Collage/Collage.svelte
similarity index 86%
rename from apps/website/src/components/organisms/Collage.svelte
rename to apps/website/src/components/organisms/Collage/Collage.svelte
index 53b96c1..a1e9e57 100644
--- a/apps/website/src/components/organisms/Collage.svelte
+++ b/apps/website/src/components/organisms/Collage/Collage.svelte
@@ -1,9 +1,9 @@
 <style lang="scss">
-    @import "../../style/organisms/collage";
+    @import "./Collage";
 </style>
 
 <script lang="ts">
-    import PhotoCard from '$components/molecules/PhotoCard.svelte'
+    import PhotoCard from '$components/molecules/PhotoCard/PhotoCard.svelte'
 
     export let photos: any[] = []
 
diff --git a/apps/website/src/style/organisms/_footer.scss b/apps/website/src/components/organisms/Footer/Footer.scss
similarity index 100%
rename from apps/website/src/style/organisms/_footer.scss
rename to apps/website/src/components/organisms/Footer/Footer.scss
diff --git a/apps/website/src/components/organisms/Footer.svelte b/apps/website/src/components/organisms/Footer/Footer.svelte
similarity index 96%
rename from apps/website/src/components/organisms/Footer.svelte
rename to apps/website/src/components/organisms/Footer/Footer.svelte
index 6a1ae8b..e577087 100644
--- a/apps/website/src/components/organisms/Footer.svelte
+++ b/apps/website/src/components/organisms/Footer/Footer.svelte
@@ -1,12 +1,12 @@
 <style lang="scss">
-    @import "../../style/organisms/footer";
+    @import "./Footer";
 </style>
 
 <script lang="ts">
     import { getContext } from 'svelte'
     // Components
     import SplitText from '$components/SplitText.svelte'
-    import SiteTitle from '$components/atoms/SiteTitle.svelte'
+    import SiteTitle from '$components/atoms/SiteTitle/SiteTitle.svelte'
 
     const { settings: { instagram, footer_links } }: any = getContext('global')
 </script>
diff --git a/apps/website/src/style/modules/_globe.scss b/apps/website/src/components/organisms/InteractiveGlobe/InteractiveGlobe.scss
similarity index 100%
rename from apps/website/src/style/modules/_globe.scss
rename to apps/website/src/components/organisms/InteractiveGlobe/InteractiveGlobe.scss
diff --git a/apps/website/src/components/organisms/InteractiveGlobe.svelte b/apps/website/src/components/organisms/InteractiveGlobe/InteractiveGlobe.svelte
similarity index 99%
rename from apps/website/src/components/organisms/InteractiveGlobe.svelte
rename to apps/website/src/components/organisms/InteractiveGlobe/InteractiveGlobe.svelte
index d208648..63f0046 100644
--- a/apps/website/src/components/organisms/InteractiveGlobe.svelte
+++ b/apps/website/src/components/organisms/InteractiveGlobe/InteractiveGlobe.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/modules/globe";
+    @import "./InteractiveGlobe";
 </style>
 
 <script lang="ts">
diff --git a/apps/website/src/style/organisms/_locations.scss b/apps/website/src/components/organisms/Locations/Locations.scss
similarity index 100%
rename from apps/website/src/style/organisms/_locations.scss
rename to apps/website/src/components/organisms/Locations/Locations.scss
diff --git a/apps/website/src/components/organisms/Locations.svelte b/apps/website/src/components/organisms/Locations/Locations.svelte
similarity index 94%
rename from apps/website/src/components/organisms/Locations.svelte
rename to apps/website/src/components/organisms/Locations/Locations.svelte
index e1af205..7a3be7d 100644
--- a/apps/website/src/components/organisms/Locations.svelte
+++ b/apps/website/src/components/organisms/Locations/Locations.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/organisms/locations";
+    @import "./Locations";
 </style>
 
 <script lang="ts">
@@ -11,8 +11,8 @@
     import { throttle } from 'utils/actions'
     import { sendEvent } from '$utils/analytics'
     // Components
-    import Button from '$components/atoms/Button.svelte'
-    import Location from '$components/molecules/Location.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
+    import Location from '$components/molecules/Location/Location.svelte'
 
     export let locations: any[]
 
diff --git a/apps/website/src/style/organisms/_newsletter.scss b/apps/website/src/components/organisms/NewsletterModule/NewsletterModule.scss
similarity index 90%
rename from apps/website/src/style/organisms/_newsletter.scss
rename to apps/website/src/components/organisms/NewsletterModule/NewsletterModule.scss
index 6e37aaf..cca9fb4 100644
--- a/apps/website/src/style/organisms/_newsletter.scss
+++ b/apps/website/src/components/organisms/NewsletterModule/NewsletterModule.scss
@@ -47,7 +47,7 @@
     }
 
     // Form input
-    :global(.newsletter-form__email) {
+    :global(.email) {
         :global(input) {
             color: $color-text;
         }
@@ -56,7 +56,7 @@
         }
     }
     // Form message
-    :global(.newsletter-form__message.is-success) {
+    :global(.message.is-success) {
         color: #fff;
         background: $color-primary-tertiary20;
     }
@@ -69,7 +69,7 @@
     &--default {
         background: $color-tertiary 50% 0 / cover url(#{$dir-img}/newsletter-beige.jpg) no-repeat;
 
-        :global(.newsletter-form__email) {
+        :global(.email) {
             background: $color-tertiary;
         }
      }
@@ -77,7 +77,7 @@
     &--light {
         background: $color-cream 50% 0 / cover url(#{$dir-img}/newsletter-cream.jpg) no-repeat;
 
-        :global(.newsletter-form__email) {
+        :global(.email) {
             background: $color-cream;
         }
     }
diff --git a/apps/website/src/components/organisms/NewsletterModule.svelte b/apps/website/src/components/organisms/NewsletterModule/NewsletterModule.svelte
similarity index 83%
rename from apps/website/src/components/organisms/NewsletterModule.svelte
rename to apps/website/src/components/organisms/NewsletterModule/NewsletterModule.svelte
index 0d9a833..c98f06f 100644
--- a/apps/website/src/components/organisms/NewsletterModule.svelte
+++ b/apps/website/src/components/organisms/NewsletterModule/NewsletterModule.svelte
@@ -1,11 +1,11 @@
 <style lang="scss">
-    @import "../../style/organisms/newsletter";
+    @import "./NewsletterModule";
 </style>
 
 <script lang="ts">
     import { getContext } from 'svelte'
     // Components
-    import EmailForm from '$components/molecules/EmailForm.svelte'
+    import EmailForm from '$components/molecules/EmailForm/EmailForm.svelte'
 
     export let theme = 'default'
 
diff --git a/apps/website/src/style/pages/shop/_posters.scss b/apps/website/src/components/organisms/PostersGrid/PostersGrid.scss
similarity index 100%
rename from apps/website/src/style/pages/shop/_posters.scss
rename to apps/website/src/components/organisms/PostersGrid/PostersGrid.scss
diff --git a/apps/website/src/components/organisms/PostersGrid.svelte b/apps/website/src/components/organisms/PostersGrid/PostersGrid.svelte
similarity index 96%
rename from apps/website/src/components/organisms/PostersGrid.svelte
rename to apps/website/src/components/organisms/PostersGrid/PostersGrid.svelte
index 8da5138..c8dd8ee 100644
--- a/apps/website/src/components/organisms/PostersGrid.svelte
+++ b/apps/website/src/components/organisms/PostersGrid/PostersGrid.svelte
@@ -1,12 +1,12 @@
 <style lang="scss">
-    @import "../../style/pages/shop/posters";
+    @import "./PostersGrid";
 </style>
 
 <script lang="ts">
     import { getContext, onMount } from 'svelte'
     import EmblaCarousel, { type EmblaCarouselType } from 'embla-carousel'
     // Components
-    import Poster from '$components/molecules/Poster.svelte'
+    import Poster from '$components/molecules/Poster/Poster.svelte'
     import { debounce } from 'utils/actions'
 
     export let posters: any = []
diff --git a/apps/website/src/style/pages/shop/_banner.scss b/apps/website/src/components/organisms/ShopBanner/ShopBanner.scss
similarity index 100%
rename from apps/website/src/style/pages/shop/_banner.scss
rename to apps/website/src/components/organisms/ShopBanner/ShopBanner.scss
diff --git a/apps/website/src/components/organisms/ShopBanner.svelte b/apps/website/src/components/organisms/ShopBanner/ShopBanner.svelte
similarity index 96%
rename from apps/website/src/components/organisms/ShopBanner.svelte
rename to apps/website/src/components/organisms/ShopBanner/ShopBanner.svelte
index bf8bc7c..aee5c13 100644
--- a/apps/website/src/components/organisms/ShopBanner.svelte
+++ b/apps/website/src/components/organisms/ShopBanner/ShopBanner.svelte
@@ -1,5 +1,5 @@
 <style lang="scss">
-    @import "../../style/pages/shop/banner";
+    @import "./ShopBanner";
 </style>
 
 <script lang="ts">
@@ -12,8 +12,8 @@
     import { quartOut } from '$animations/easings'
     // Components
     import Image from '$components/atoms/Image.svelte'
-    import ButtonCart from '$components/atoms/ButtonCart.svelte'
-    import ShopLocationSwitcher from '$components/molecules/ShopLocationSwitcher.svelte'
+    import ButtonCart from '$components/atoms/ButtonCart/ButtonCart.svelte'
+    import ShopLocationSwitcher from '$components/molecules/ShopLocationSwitcher/ShopLocationSwitcher.svelte'
 
     export let product: any = undefined
 
diff --git a/apps/website/src/style/organisms/_shop.scss b/apps/website/src/components/organisms/ShopModule/ShopModule.scss
similarity index 100%
rename from apps/website/src/style/organisms/_shop.scss
rename to apps/website/src/components/organisms/ShopModule/ShopModule.scss
diff --git a/apps/website/src/components/organisms/ShopModule.svelte b/apps/website/src/components/organisms/ShopModule/ShopModule.svelte
similarity index 96%
rename from apps/website/src/components/organisms/ShopModule.svelte
rename to apps/website/src/components/organisms/ShopModule/ShopModule.svelte
index 7d79ce4..36e89a5 100644
--- a/apps/website/src/components/organisms/ShopModule.svelte
+++ b/apps/website/src/components/organisms/ShopModule/ShopModule.svelte
@@ -1,11 +1,11 @@
 <style lang="scss">
-    @import "../../style/organisms/shop";
+    @import "./ShopModule";
 </style>
 
 <script lang="ts">
     import { getContext, onMount } from 'svelte'
     // Components
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import Image from '$components/atoms/Image.svelte'
 
     const { locations, shop }: any = getContext('global')
diff --git a/apps/website/src/routes/(shop)/shop/+error.svelte b/apps/website/src/routes/(shop)/shop/+error.svelte
index 34b1b16..70a8cdf 100644
--- a/apps/website/src/routes/(shop)/shop/+error.svelte
+++ b/apps/website/src/routes/(shop)/shop/+error.svelte
@@ -3,8 +3,8 @@
     import { page } from '$app/stores'
     // Components
     import Metas from '$components/Metas.svelte'
-    import ShopHeader from '$components/organisms/ShopBanner.svelte'
-    import PostersGrid from '$components/organisms/PostersGrid.svelte'
+    import ShopHeader from '$components/organisms/ShopBanner/ShopBanner.svelte'
+    import PostersGrid from '$components/organisms/PostersGrid/PostersGrid.svelte'
 
     const { posters }: any = getContext('shop')
     const errors = {
diff --git a/apps/website/src/routes/(shop)/shop/+layout.svelte b/apps/website/src/routes/(shop)/shop/+layout.svelte
index f797c29..6307d9f 100644
--- a/apps/website/src/routes/(shop)/shop/+layout.svelte
+++ b/apps/website/src/routes/(shop)/shop/+layout.svelte
@@ -6,8 +6,8 @@
     import { setContext } from 'svelte'
     import { cartNotifications } from '$utils/stores/shop'
     // Components
-    import Cart from '$components/organisms/Cart.svelte'
-    import NotificationCart from '$components/molecules/NotificationCart.svelte'
+    import Cart from '$components/organisms/Cart/Cart.svelte'
+    import NotificationCart from '$components/molecules/NotificationCart/NotificationCart.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/(shop)/shop/+page.svelte b/apps/website/src/routes/(shop)/shop/+page.svelte
index fc41728..de2fee0 100644
--- a/apps/website/src/routes/(shop)/shop/+page.svelte
+++ b/apps/website/src/routes/(shop)/shop/+page.svelte
@@ -4,9 +4,9 @@
     import { shopCurrentProductSlug } from '$utils/stores/shop'
     // Components
     import Metas from '$components/Metas.svelte'
-    import PostersGrid from '$components/organisms/PostersGrid.svelte'
-    import ShopHeader from '$components/organisms/ShopBanner.svelte'
-    import PosterLayout from '$components/layouts/PosterLayout.svelte'
+    import PostersGrid from '$components/organisms/PostersGrid/PostersGrid.svelte'
+    import ShopHeader from '$components/organisms/ShopBanner/ShopBanner.svelte'
+    import PosterLayout from '$components/layouts/PosterLayout/PosterLayout.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.svelte b/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.svelte
index 2ac1a77..b009f67 100644
--- a/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.svelte
+++ b/apps/website/src/routes/(shop)/shop/[type]-[name]/+page.svelte
@@ -5,9 +5,9 @@
     import { capitalizeFirstLetter } from 'utils/string'
     // Components
     import Metas from '$components/Metas.svelte'
-    import ShopHeader from '$components/organisms/ShopBanner.svelte'
-    import PostersGrid from '$components/organisms/PostersGrid.svelte'
-    import PosterLayout from '$components/layouts/PosterLayout.svelte'
+    import ShopHeader from '$components/organisms/ShopBanner/ShopBanner.svelte'
+    import PostersGrid from '$components/organisms/PostersGrid/PostersGrid.svelte'
+    import PosterLayout from '$components/layouts/PosterLayout/PosterLayout.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/(site)/[country]/[location]/+page.svelte b/apps/website/src/routes/(site)/[country]/[location]/+page.svelte
index 91b3507..2c10420 100644
--- a/apps/website/src/routes/(site)/[country]/[location]/+page.svelte
+++ b/apps/website/src/routes/(site)/[country]/[location]/+page.svelte
@@ -17,12 +17,12 @@
     // Components
     import Metas from '$components/Metas.svelte'
     import Image from '$components/atoms/Image.svelte'
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import IconEarth from '$components/atoms/IconEarth.svelte'
-    import House from '$components/molecules/House.svelte'
-    import Pagination from '$components/molecules/Pagination.svelte'
-    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
-    import ShopModule from '$components/organisms/ShopModule.svelte'
+    import House from '$components/molecules/House/House.svelte'
+    import Pagination from '$components/molecules/Pagination/Pagination.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule/NewsletterModule.svelte'
+    import ShopModule from '$components/organisms/ShopModule/ShopModule.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.svelte b/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.svelte
index 59a785b..cd96db3 100644
--- a/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.svelte
+++ b/apps/website/src/routes/(site)/[country]/[location]/[photo]/+page.svelte
@@ -22,7 +22,7 @@
     import Image from '$components/atoms/Image.svelte'
     import Icon from '$components/atoms/Icon.svelte'
     import IconArrow from '$components/atoms/IconArrow.svelte'
-    import ButtonCircle from '$components/atoms/ButtonCircle.svelte'
+    import ButtonCircle from '$components/atoms/ButtonCircle/ButtonCircle.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/(site)/about/+page.svelte b/apps/website/src/routes/(site)/about/+page.svelte
index 7c030e4..30e9c26 100644
--- a/apps/website/src/routes/(site)/about/+page.svelte
+++ b/apps/website/src/routes/(site)/about/+page.svelte
@@ -17,10 +17,10 @@
     // Components
     import Metas from '$components/Metas.svelte'
     import Image from '$components/atoms/Image.svelte'
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import AboutGridPhoto from '$components/atoms/AboutGridPhoto.svelte'
-    import ProcessStep from '$components/molecules/ProcessStep.svelte'
-    import Banner from '$components/organisms/Banner.svelte'
+    import ProcessStep from '$components/molecules/ProcessStep/ProcessStep.svelte'
+    import Banner from '$components/organisms/Banner/Banner.svelte'
 
     export let data
     const { about, photos } = data
diff --git a/apps/website/src/routes/(site)/credits/+page.svelte b/apps/website/src/routes/(site)/credits/+page.svelte
index 1384b72..665737b 100644
--- a/apps/website/src/routes/(site)/credits/+page.svelte
+++ b/apps/website/src/routes/(site)/credits/+page.svelte
@@ -11,8 +11,8 @@
     // Components
     import Metas from '$components/Metas.svelte'
     import Image from '$components/atoms/Image.svelte'
-    import Heading from '$components/molecules/Heading.svelte'
-    import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
+    import Heading from '$components/molecules/Heading/Heading.svelte'
+    import InteractiveGlobe from '$components/organisms/InteractiveGlobe/InteractiveGlobe.svelte'
 
     export let data
     const { credit } = data
diff --git a/apps/website/src/routes/(site)/locations/+page.svelte b/apps/website/src/routes/(site)/locations/+page.svelte
index c88042a..b3bb4cd 100644
--- a/apps/website/src/routes/(site)/locations/+page.svelte
+++ b/apps/website/src/routes/(site)/locations/+page.svelte
@@ -6,11 +6,11 @@
     import { getContext } from 'svelte'
     // Components
     import Metas from '$components/Metas.svelte'
-    import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
-    import Locations from '$components/organisms/Locations.svelte'
-    import ShopModule from '$components/organisms/ShopModule.svelte'
-    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
-    import Heading from '$components/molecules/Heading.svelte'
+    import InteractiveGlobe from '$components/organisms/InteractiveGlobe/InteractiveGlobe.svelte'
+    import Locations from '$components/organisms/Locations/Locations.svelte'
+    import ShopModule from '$components/organisms/ShopModule/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule/NewsletterModule.svelte'
+    import Heading from '$components/molecules/Heading/Heading.svelte'
 
     const { locations }: any = getContext('global')
     const text = 'Explore the globe to discover unique locations across the world'
diff --git a/apps/website/src/routes/(site)/photos/+page.svelte b/apps/website/src/routes/(site)/photos/+page.svelte
index 35b5940..a497cd3 100644
--- a/apps/website/src/routes/(site)/photos/+page.svelte
+++ b/apps/website/src/routes/(site)/photos/+page.svelte
@@ -21,14 +21,14 @@
     import Metas from '$components/Metas.svelte'
     import SplitText from '$components/SplitText.svelte'
     import IconEarth from '$components/atoms/IconEarth.svelte'
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import Image from '$components/atoms/Image.svelte'
     import ScrollingTitle from '$components/atoms/ScrollingTitle.svelte'
     import DiscoverText from '$components/atoms/DiscoverText.svelte'
-    import PostCard from '$components/molecules/PostCard.svelte'
+    import PostCard from '$components/molecules/PostCard/PostCard.svelte'
     import Select from '$components/molecules/Select.svelte'
-    import ShopModule from '$components/organisms/ShopModule.svelte'
-    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
+    import ShopModule from '$components/organisms/ShopModule/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule/NewsletterModule.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/(site)/subscribe/+page.svelte b/apps/website/src/routes/(site)/subscribe/+page.svelte
index 1e7123f..ac7ae6c 100644
--- a/apps/website/src/routes/(site)/subscribe/+page.svelte
+++ b/apps/website/src/routes/(site)/subscribe/+page.svelte
@@ -10,10 +10,10 @@
     import { quartOut } from '$animations/easings'
     // Components
     import Metas from '$components/Metas.svelte'
-    import Heading from '$components/molecules/Heading.svelte'
-    import EmailForm from '$components/molecules/EmailForm.svelte'
-    import NewsletterIssue from '$components/molecules/NewsletterIssue.svelte'
-    import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
+    import Heading from '$components/molecules/Heading/Heading.svelte'
+    import EmailForm from '$components/molecules/EmailForm/EmailForm.svelte'
+    import NewsletterIssue from '$components/molecules/NewsletterIssue/NewsletterIssue.svelte'
+    import InteractiveGlobe from '$components/organisms/InteractiveGlobe/InteractiveGlobe.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/(site)/terms/+page.svelte b/apps/website/src/routes/(site)/terms/+page.svelte
index 29c5649..eb051ff 100644
--- a/apps/website/src/routes/(site)/terms/+page.svelte
+++ b/apps/website/src/routes/(site)/terms/+page.svelte
@@ -7,7 +7,7 @@
     import relativeTime from 'dayjs/plugin/relativeTime'
     // Components
     import Metas from '$components/Metas.svelte'
-    import Heading from '$components/molecules/Heading.svelte'
+    import Heading from '$components/molecules/Heading/Heading.svelte'
 
     export let data
     const { legal } = data
diff --git a/apps/website/src/routes/+error.svelte b/apps/website/src/routes/+error.svelte
index 1b923ee..72c181c 100644
--- a/apps/website/src/routes/+error.svelte
+++ b/apps/website/src/routes/+error.svelte
@@ -7,13 +7,13 @@
     import { page } from '$app/stores'
     // Components
     import Metas from '$components/Metas.svelte'
-    import BoxCTA from '$components/atoms/BoxCTA.svelte'
-    import Heading from '$components/molecules/Heading.svelte'
-    import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
+    import BoxCTA from '$components/atoms/BoxCTA/BoxCTA.svelte'
+    import Heading from '$components/molecules/Heading/Heading.svelte'
+    import InteractiveGlobe from '$components/organisms/InteractiveGlobe/InteractiveGlobe.svelte'
     import ListCTAs from '$components/organisms/ListCTAs.svelte'
-    import Locations from '$components/organisms/Locations.svelte'
-    import ShopModule from '$components/organisms/ShopModule.svelte'
-    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
+    import Locations from '$components/organisms/Locations/Locations.svelte'
+    import ShopModule from '$components/organisms/ShopModule/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule/NewsletterModule.svelte'
 
     const { locations }: any = getContext('global')
     const errors = {
diff --git a/apps/website/src/routes/+layout.svelte b/apps/website/src/routes/+layout.svelte
index 7b1247c..af4c2e6 100644
--- a/apps/website/src/routes/+layout.svelte
+++ b/apps/website/src/routes/+layout.svelte
@@ -31,9 +31,9 @@
     import SVGSprite from '$components/SVGSprite.svelte'
     import SmoothScroll from '$components/SmoothScroll.svelte'
     import Analytics from '$components/Analytics.svelte'
-    import Switcher from '$components/molecules/Switcher.svelte'
-    import Toast from '$components/molecules/Toast.svelte'
-    import Footer from '$components/organisms/Footer.svelte'
+    import Switcher from '$components/molecules/Switcher/Switcher.svelte'
+    import Toast from '$components/molecules/Toast/Toast.svelte'
+    import Footer from '$components/organisms/Footer/Footer.svelte'
 
     export let data
 
diff --git a/apps/website/src/routes/+page.svelte b/apps/website/src/routes/+page.svelte
index 5acb0fe..97c7032 100644
--- a/apps/website/src/routes/+page.svelte
+++ b/apps/website/src/routes/+page.svelte
@@ -14,17 +14,17 @@
     // Components
     import Metas from '$components/Metas.svelte'
     import SplitText from '$components/SplitText.svelte'
-    import Button from '$components/atoms/Button.svelte'
+    import Button from '$components/atoms/Button/Button.svelte'
     import IconEarth from '$components/atoms/IconEarth.svelte'
     import ScrollingTitle from '$components/atoms/ScrollingTitle.svelte'
-    import BoxCTA from '$components/atoms/BoxCTA.svelte'
+    import BoxCTA from '$components/atoms/BoxCTA/BoxCTA.svelte'
     import DiscoverText from '$components/atoms/DiscoverText.svelte'
-    import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
-    import Collage from '$components/organisms/Collage.svelte'
-    import Locations from '$components/organisms/Locations.svelte'
+    import InteractiveGlobe from '$components/organisms/InteractiveGlobe/InteractiveGlobe.svelte'
+    import Collage from '$components/organisms/Collage/Collage.svelte'
+    import Locations from '$components/organisms/Locations/Locations.svelte'
     import ListCTAs from '$components/organisms/ListCTAs.svelte'
-    import ShopModule from '$components/organisms/ShopModule.svelte'
-    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
+    import ShopModule from '$components/organisms/ShopModule/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule/NewsletterModule.svelte'
 
     export let data
 
diff --git a/apps/website/src/style/atoms/_arrow.scss b/apps/website/src/style/atoms/_arrow.scss
deleted file mode 100644
index f40101b..0000000
--- a/apps/website/src/style/atoms/_arrow.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.arrow {
-    display: block;
-
-    // Colors
-    &--white {
-        color: #fff;
-    }
-    &--pink {
-        color: $color-secondary;
-    }
-
-    // Variants
-    &--flip {
-        transform: rotate(180deg);
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/atoms/_badge.scss b/apps/website/src/style/atoms/_badge.scss
deleted file mode 100644
index 38d5b97..0000000
--- a/apps/website/src/style/atoms/_badge.scss
+++ /dev/null
@@ -1,21 +0,0 @@
-.badge {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: 16px;
-    margin: 0 auto;
-    padding: 0 6px;
-    text-align: center;
-    background: $color-secondary-light;
-    font-weight: 500;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    line-height: 1;
-    color: $color-primary-darker;
-    border-radius: 100vh;
-
-    // Small size
-    &--small {
-        font-size: rem(7px);
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/atoms/_discover.scss b/apps/website/src/style/atoms/_discover.scss
deleted file mode 100644
index c731417..0000000
--- a/apps/website/src/style/atoms/_discover.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.discover {
-    padding: 0 20px;
-    font-family: $font-sans;
-    font-size: rem(24px);
-    font-weight: 200;
-    line-height: 1.5;
-    color: $color-tertiary;
-
-    @include bp (sm) {
-        font-size: rem(28px);
-    }
-    @include bp (md) {
-        font-size: rem(32px);
-    }
-
-    strong {
-        color: $color-secondary;
-        font-weight: 200;
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/global.scss b/apps/website/src/style/global.scss
index 67717b2..94b332b 100644
--- a/apps/website/src/style/global.scss
+++ b/apps/website/src/style/global.scss
@@ -22,4 +22,4 @@
 
 // Components (Atomic Design System)
 // Atoms
-@import "atoms/photo";
\ No newline at end of file
+@import "atoms/photo";
diff --git a/apps/website/src/style/molecules/_heading.scss b/apps/website/src/style/molecules/_heading.scss
deleted file mode 100644
index ab62a29..0000000
--- a/apps/website/src/style/molecules/_heading.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-.heading {
-    overflow: hidden;
-    margin-bottom: 72px;
-    text-align: center;
-    color: $color-tertiary;
-
-    @include bp (sm) {
-        margin-bottom: clamp(72px, 8vw, 128px);
-    }
-
-    // Title
-    :global(h1) {
-        margin-top: 56px;
-        line-height: 1;
-        color: $color-secondary;
-
-        @include bp (sm) {
-            margin-top: clamp(80px, 9vw, 160px);
-        }
-    }
-
-    // Text
-    .text {
-        width: 75%;
-        max-width: 360px;
-        margin: 40px auto 0;
-        font-weight: 200;
-
-        @include bp (sm) {
-            max-width: 600px;
-            margin-top: 72px;
-        }
-
-        :global(a) {
-            position: relative;
-            color: currentColor;
-            text-decoration: none;
-            display: inline-block;
-            background-image: linear-gradient(rgba($color-tertiary, 0.3), rgba($color-tertiary, 0.3));
-            background-position: 0 100%;
-            background-size: 100% 1px;
-            background-repeat: no-repeat;
-            transition: color 0.4s var(--ease-quart);
-
-            &:hover {
-                color: $color-secondary-light;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/molecules/_newsletter-form.scss b/apps/website/src/style/molecules/_newsletter-form.scss
deleted file mode 100644
index a80fb05..0000000
--- a/apps/website/src/style/molecules/_newsletter-form.scss
+++ /dev/null
@@ -1,124 +0,0 @@
-// Email Form
-.newsletter-form {
-    position: relative;
-
-    &__email {
-        position: relative;
-        width: 100%;
-        max-width: 600px;
-        height: 56px;
-        margin-bottom: 20px;
-        padding: 0 24px;
-        border-radius: 100vh;
-        box-shadow: inset 0 0 0 2px $color-secondary;
-        transition: box-shadow 0.6s var(--ease-quart);
-
-        @include bp (sm) {
-            height: 64px;
-            padding: 0 30px;
-        }
-
-        :global(input) {
-            display: block;
-            width: 100%;
-            height: 100%;
-            font-size: rem(16px);
-            font-family: $font-sans;
-            font-weight: 300;
-            color: $color-tertiary;
-            background: none;
-            border: none;
-
-            @include bp (sm) {
-                font-size: rem(18px);
-            }
-        }
-        :global(input::placeholder) {
-            color: rgba($color-tertiary, 0.6);
-            opacity: 1;
-        }
-        :global(button) {
-            position: absolute !important;
-            right: 16px;
-            top: 50%;
-            transform: translateY(-50%);
-            margin-left: 32px;
-            flex-shrink: 0;
-        }
-
-        // States
-        &.is-focused, &:hover {
-            box-shadow: inset 0 0 0 4px $color-secondary;
-        }
-    }
-
-    // Bottom details
-    &__bottom {
-        display: block;
-        text-align: center;
-        font-size: rem(14px);
-        max-width: 600px;
-
-        @include bp (sm) {
-            display: flex;
-            justify-content: center;
-            font-size: rem(16px);
-        }
-
-        .past-issues {
-            display: inline-flex;
-            align-items: center;
-            margin: 0 auto auto 0;
-            text-decoration: none;
-            color: $color-text;
-
-            &, span {
-                transition: color 0.2s, border-color 0.2s;
-            }
-            span {
-                display: block;
-                padding-bottom: 2px;
-                font-size: rem(14px);
-                color: $color-text;
-                margin-left: 8px;
-                border-bottom: 1px solid $color-text;
-
-                @include bp (sm) {
-                    margin-left: 12px;
-                    padding-bottom: 0;
-                    font-size: rem(16px);
-                }
-            }
-        }
-        p {
-            color: $color-gray;
-            line-height: 1.3;
-            margin-top: 16px;
-            margin-bottom: 0;
-
-            @include bp (sm) {
-                margin-top: 0;
-            }
-        }
-    }
-
-    // Message
-    &__message {
-        padding: 24px;
-        text-align: center;
-        border-radius: 8px;
-
-        &.is-error {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            color: #fff;
-            background: $color-secondary;
-        }
-        &.is-success {
-            color: $color-text;
-            background: $color-tertiary;
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/molecules/_notification-cart.scss b/apps/website/src/style/molecules/_notification-cart.scss
deleted file mode 100644
index dcf5708..0000000
--- a/apps/website/src/style/molecules/_notification-cart.scss
+++ /dev/null
@@ -1,61 +0,0 @@
-.notification-cart {
-    display: flex;
-    background-color: #fff;
-    color: $color-gray;
-    border-radius: 6px;
-    align-items: center;
-    overflow: hidden;
-    cursor: pointer;
-    pointer-events: auto;
-
-    // Left Image
-    &__left {
-        margin-right: 20px;
-        width: 100px;
-        height: 150px;
-
-        @include bp (sm) {
-            margin-right: 24px;
-            width: 58px;
-            height: 88px;
-        }
-
-        img {
-            display: block;
-            width: 100%;
-            height: 100%;
-            object-fit: cover;
-        }
-    }
-
-    // Details
-    &__right {
-        display: flex;
-        flex-direction: column;
-        margin-right: 24px;
-        justify-content: center;
-
-        // Poster Title
-        h3 {
-            font-family: $font-serif;
-            color: $color-secondary;
-            font-size: rem(20px);
-
-            @include bp (sm) {
-                font-size: rem(18px);
-            }
-        }
-        // Text
-        p {
-            font-size: rem(12px);
-            line-height: 1.4;
-            max-width: 124px;
-            margin: 4px 0;
-
-            @include bp (sm) {
-                font-size: rem(13px);
-                max-width: none;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/molecules/_process-step.scss b/apps/website/src/style/molecules/_process-step.scss
deleted file mode 100644
index 1996acb..0000000
--- a/apps/website/src/style/molecules/_process-step.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-// About page Step
-.step {
-    position: relative;
-    display: block;
-    overflow: hidden;
-    padding: 32px;
-    background: $color-primary-darker;
-    border-radius: 12px;
-    transform: translateZ(0);
-
-    @include bp (sm) {
-        --columns: 11;
-        display: grid;
-        grid-template-rows: repeat(2, 1fr);
-        padding: 8% 0;
-        min-height: clamp(400px, 75vh, 800px);
-        border-radius: 16px;
-    }
-
-    // Image
-    .media {
-        position: relative;
-        z-index: 2;
-        display: block;
-        overflow: hidden;
-        width: 70%;
-        max-height: 550px;
-        margin-bottom: 28px;
-        border-radius: 6px;
-
-        @include bp (sm) {
-            grid-column: 2 / span 6;
-            grid-row: 1 / -1;
-            width: 100%;
-            height: auto;
-            margin-bottom: 48px;
-        }
-
-        :global(.image img), video {
-            display: block;
-            width: 100%;
-            height: 100%;
-            object-fit: cover;
-        }
-    }
-
-    // Content
-    .text {
-        position: relative;
-        z-index: 2;
-        line-height: 1.5;
-        font-weight: 300;
-        color: $color-secondary-light;
-        grid-column: 2 / -2;
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/molecules/_shop-locationswitcher.scss b/apps/website/src/style/molecules/_shop-locationswitcher.scss
deleted file mode 100644
index 6407bf1..0000000
--- a/apps/website/src/style/molecules/_shop-locationswitcher.scss
+++ /dev/null
@@ -1,45 +0,0 @@
-.shop-locationswitcher {
-    pointer-events: auto;
-
-    dt {
-        color: $color-primary;
-        font-weight: 400;
-        line-height: 1;
-        font-size: rem(12px);
-    }
-    dd {
-        color: $color-secondary;
-
-        svg {
-            display: inline-block;
-            width: 14px;
-            height: 14px;
-            margin-right: 4px;
-
-            @include bp (sm) {
-                width: 18px;
-                height: 18px;
-            }
-        }
-        select {
-            background: none;
-            border: none;
-            font-size: rem(18px);
-            color: $color-secondary;
-            font-family: $font-serif;
-            cursor: pointer;
-            appearance: none;
-
-            @include bp (sm) {
-                font-size: rem(24px);
-            }
-        }
-    }
-
-    // Overlaid
-    &.is-over {
-        dt {
-            color: #fff;
-        }
-    }
-}
\ No newline at end of file
diff --git a/apps/website/src/style/pages/_subscribe.scss b/apps/website/src/style/pages/_subscribe.scss
index df08675..e4933d4 100644
--- a/apps/website/src/style/pages/_subscribe.scss
+++ b/apps/website/src/style/pages/_subscribe.scss
@@ -12,10 +12,11 @@
                 margin-top: 0;
                 margin-bottom: 120px;
             }
-        }
-        :global(.newsletter-form__bottom) {
-            :global(p) {
-                color: rgba($color-tertiary, 0.6);
+
+            :global(.bottom) {
+                :global(p) {
+                    color: rgba($color-tertiary, 0.6);
+                }
             }
         }
     }