feat: remove nesting folder

src/pages/about.astro

@@ -7,9 +7,9 @@ import { CONTACT_DETAILS } from "@const/index";
 import { client } from "@lib/contentful";
 import BaseLayout from "@shared/ui/components/baseLayout/BaseLayout.astro";
 import Breadcrumbs from "@shared/ui/components/breadcrumbs/Breadcrumbs.astro";
-import AboutIntro from "@ui/components/modules/about/components/aboutIntro/AboutIntro.astro";
-import AboutLatestArticles from "@ui/components/modules/about/components/aboutLatestArticles/AboutLatestArticles.astro";
-import { LittleMoreOfMe } from "@ui/components/modules/about/components/littleMoreOfMe/LittleMoreOfMe.tsx";
+import AboutIntro from "@ui/modules/about/components/aboutIntro/AboutIntro.astro";
+import AboutLatestArticles from "@ui/modules/about/components/aboutLatestArticles/AboutLatestArticles.astro";
+import { LittleMoreOfMe } from "@ui/modules/about/components/littleMoreOfMe/LittleMoreOfMe.tsx";
 
 const [{ items: rawAuthors }, { items: rawCities }] = await Promise.all([
 	client.getEntries<RawAuthor>({ content_type: "author" }) as Iterable<PromiseLike<RawAuthor[]> | RawAuthor[]>,

src/pages/articles/index.astro

@@ -2,11 +2,11 @@
 import { articleDTO } from "@application/dto/article/articleDTO";
 import type { RawArticle } from "@application/dto/article/types";
 import { client } from "@lib/contentful";
+import FeaturedArticle from "@modules/articles/components/featuredArticle/FeaturedArticle.astro";
 import ArticleCard from "@shared/ui/components/articleCard/ArticleCard.astro";
 import BaseLayout from "@shared/ui/components/baseLayout/BaseLayout.astro";
 import Breadcrumbs from "@shared/ui/components/breadcrumbs/Breadcrumbs.astro";
-import FeaturedArticle from "@ui/components/modules/articles/components/featuredArticle/FeaturedArticle.astro";
-import { getFeaturedArticle } from "src/shared/ui/utils/getFeaturedArticle";
+import { getFeaturedArticle } from "@shared/ui/utils/getFeaturedArticle";
 import "./_articles.css";
 
 const { items: rawArticles } = await client.getEntries<RawArticle>({

src/pages/contact.astro

@@ -1,7 +1,7 @@
 ---
 import BaseLayout from '@shared/ui/components/baseLayout/BaseLayout.astro';
-import ContactIntro from '@ui/components/modules/contact/components/contactIntro/ContactIntro.astro';
-import Tabs from '@ui/components/modules/contact/components/tabs/Tabs.astro';
+import ContactIntro from '@modules/contact/components/contactIntro/ContactIntro.astro';
+import Tabs from '@modules/contact/components/tabs/Tabs.astro';
 import Breadcrumbs from '@shared/ui/components/breadcrumbs/Breadcrumbs.astro';
 import LatestArticles from '@shared/ui/components/latestArticles/LatestArticles.astro';---
 

src/pages/index.astro

@@ -1,9 +1,9 @@
 ---
-import MyWork from "@components/modules/home/components/myWork/MyWork.astro";
-import Testimonials from "@components/modules/home/components/testimonials/Testimonials.astro";
-import Welcome from "@components/modules/home/components/welcome/Welcome.astro";
+import MyWork from "@modules/home/components/myWork/MyWork.astro";
+import Testimonials from "@modules/home/components/testimonials/Testimonials.astro";
+import Welcome from "@modules/home/components/welcome/Welcome.astro";
 import BaseLayout from "@shared/ui/components/baseLayout/BaseLayout.astro";
-import LatestArticles from "../shared/ui/components/latestArticles/LatestArticles.astro";
+import LatestArticles from "@shared/ui/components/latestArticles/LatestArticles.astro";
 
 // todo: use location for breadrumbs instead of passing the classname
 // todo: add related articles card?

src/pages/privacy-policy.astro

@@ -1,8 +1,8 @@
 ---
 import { CONTACT_DETAILS, DEFAULT_DATE_FORMAT } from "@const/index";
+import LegalSection from "@modules/legal/components/legalSection/LegalSection.astro";
 import BaseLayout from "@shared/ui/components/baseLayout/BaseLayout.astro";
 import EmailButton from "@shared/ui/components/emailButton/EmailButton.astro";
-import LegalSection from "@ui/components/modules/legal/components/legalSection/LegalSection.astro";
 
 const today = new Date().toLocaleDateString("en", DEFAULT_DATE_FORMAT);
 ---

src/pages/projects.astro

@@ -3,9 +3,9 @@ import { Image } from "astro:assets";
 import { projectDTO } from "@application/dto/project";
 import type { RawProject } from "@application/dto/project/types";
 import { client } from "@lib/contentful";
+import ProjectSection from "@modules/projects/components/projectSection/ProjectSection.astro";
+import ProjectsIntro from "@modules/projects/components/projectsIntro/ProjectsIntro.astro";
 import BaseLayout from "@shared/ui/components/baseLayout/BaseLayout.astro";
-import ProjectSection from "@ui/components/modules/projects/components/projectSection/ProjectSection.astro";
-import ProjectsIntro from "@ui/components/modules/projects/components/projectsIntro/ProjectsIntro.astro";
 
 const { items: rawProjects } = await client.getEntries<RawProject>({
 	content_type: "project",

src/pages/terms-and-conditions.astro

@@ -1,8 +1,8 @@
 ---
 import { CONTACT_DETAILS, DEFAULT_DATE_FORMAT } from "@const/index";
+import LegalSection from "@modules/legal/components/legalSection/LegalSection.astro";
 import BaseLayout from "@shared/ui/components/baseLayout/BaseLayout.astro";
 import EmailButton from "@shared/ui/components/emailButton/EmailButton.astro";
-import LegalSection from "@ui/components/modules/legal/components/legalSection/LegalSection.astro";
 
 const today = new Date().toLocaleDateString("en", DEFAULT_DATE_FORMAT);
 ---

src/ui/components/modules/about/components/cities/Cities.tsx → src/ui/modules/about/components/cities/Cities.tsx

@@ -1,5 +1,5 @@
 import type { CityDTO } from "@application/dto/city/types.ts";
-import { CityCard } from "@components/modules/about/components/cityCard";
+import { CityCard } from "@modules/about/components/cityCard";
 import "./cities.css";
 
 interface CitiesProps {

src/ui/components/modules/about/components/cityCard/CityCard.tsx → src/ui/modules/about/components/cityCard/CityCard.tsx

@@ -1,11 +1,11 @@
-import { CityDescription } from "@components/modules/about/components/cityCard/atoms/cityDescription";
-import type { CityDescriptionProps } from "@components/modules/about/components/cityCard/atoms/cityDescription";
-import { CityImage } from "@components/modules/about/components/cityCard/atoms/cityImage";
-import type { CityImageProps } from "@components/modules/about/components/cityCard/atoms/cityImage";
-import { CityName } from "@components/modules/about/components/cityCard/atoms/cityName";
-import type { CityTitleProps } from "@components/modules/about/components/cityCard/atoms/cityName";
-import { CityPeriod } from "@components/modules/about/components/cityCard/atoms/cityPeriod";
-import type { CityPeriodProps } from "@components/modules/about/components/cityCard/atoms/cityPeriod";
+import { CityDescription } from "@modules/about/components/cityCard/atoms/cityDescription";
+import type { CityDescriptionProps } from "@modules/about/components/cityCard/atoms/cityDescription";
+import { CityImage } from "@modules/about/components/cityCard/atoms/cityImage";
+import type { CityImageProps } from "@modules/about/components/cityCard/atoms/cityImage";
+import { CityName } from "@modules/about/components/cityCard/atoms/cityName";
+import type { CityTitleProps } from "@modules/about/components/cityCard/atoms/cityName";
+import { CityPeriod } from "@modules/about/components/cityCard/atoms/cityPeriod";
+import type { CityPeriodProps } from "@modules/about/components/cityCard/atoms/cityPeriod";
 import type { CSSProperties, ReactNode } from "react";
 import "./city-card.css";
 

src/ui/components/modules/about/components/littleMoreOfMe/LittleMoreOfMe.tsx → src/ui/modules/about/components/littleMoreOfMe/LittleMoreOfMe.tsx

@@ -1,6 +1,6 @@
 import type { CityDTO } from "@application/dto/city/types.ts";
-import { Cities } from "@components/modules/about/components/cities";
-import WorldGlobe from "@components/modules/about/components/worldGlobe/WorldGlobe.tsx";
+import { Cities } from "@modules/about/components/cities";
+import WorldGlobe from "@modules/about/components/worldGlobe/WorldGlobe.tsx";
 import "./little-more-of-me.css";
 
 interface LittleMoreOfMeProps {

src/ui/components/modules/about/components/worldGlobe/WorldGlobe.tsx → src/ui/modules/about/components/worldGlobe/WorldGlobe.tsx

@@ -2,12 +2,12 @@ import type { CityDTO } from "@application/dto/city/types.ts";
 import horizontalArrow from "@assets/images/svg/left-arrow.svg";
 import zoomIn from "@assets/images/svg/zoom-in.svg";
 import zoomOut from "@assets/images/svg/zoom-out.svg";
-import useTabVisibility, { TabVisibility } from "@components/modules/about/hooks/useTabVisibility/useTabVisibility.ts";
-import { calculateCenter } from "@components/modules/about/utils/calculateCenter";
-import { refineCities } from "@components/modules/about/utils/refineCities";
-import { renderPin } from "@components/modules/about/utils/renderPin";
 import { WORLD_GLOBE_CONFIG } from "@const/index.ts";
 import countries from "@data/countries.geojson.json";
+import useTabVisibility, { TabVisibility } from "@modules/about/hooks/useTabVisibility/useTabVisibility.ts";
+import { calculateCenter } from "@modules/about/utils/calculateCenter";
+import { refineCities } from "@modules/about/utils/refineCities";
+import { renderPin } from "@modules/about/utils/renderPin";
 import { Image } from "@shared/ui/components/Image";
 import { memo, useCallback, useEffect, useRef } from "react";
 import type { GlobeMethods } from "react-globe.gl";

src/ui/components/modules/about/utils/refineCities/refineCities.ts → src/ui/modules/about/utils/refineCities/refineCities.ts

@@ -1,5 +1,5 @@
 import type { CityDTO } from "@application/dto/city/types.ts";
-import type { ReactGlobePoint } from "@components/modules/about/components/worldGlobe";
+import type { ReactGlobePoint } from "@modules/about/components/worldGlobe";
 
 export function refineCities(cities: CityDTO[]): ReactGlobePoint[] {
 	return cities.map(({ coordinates, name }) => ({

src/ui/components/modules/about/utils/renderPin/renderPin.ts → src/ui/modules/about/utils/renderPin/renderPin.ts

@@ -1,5 +1,5 @@
 import { Pin as pin } from "@assets/images/svg-components/pin";
-import type { ReactGlobePoint } from "@components/modules/about/components/worldGlobe";
+import type { ReactGlobePoint } from "@modules/about/components/worldGlobe";
 import { createRoot } from "react-dom/client";
 
 interface RenderPinProps {

src/ui/components/modules/contact/components/contactForm/ContactForm.tsx → src/ui/modules/contact/components/contactForm/ContactForm.tsx

@@ -1,7 +1,7 @@
 import { actions } from "astro:actions";
-import { autosize } from "@components/modules/contact/utils/autosize";
-import { flyPlane } from "@components/modules/contact/utils/flyPlane";
 import { zodResolver } from "@hookform/resolvers/zod";
+import { autosize } from "@modules/contact/utils/autosize";
+import { flyPlane } from "@modules/contact/utils/flyPlane";
 import Spinner from "@shared/ui/components/spinner/Spinner.tsx";
 import type { FormEvent } from "react";
 import { useCallback, useRef, useState } from "react";

src/ui/components/modules/contact/components/contactFormProvider/ContactFormProvider.tsx → src/ui/modules/contact/components/contactFormProvider/ContactFormProvider.tsx

@@ -1,4 +1,4 @@
-import { ContactForm } from "@components/modules/contact/components/contactForm";
+import { ContactForm } from "@modules/contact/components/contactForm";
 import { GoogleReCaptchaProvider } from "react-google-recaptcha-v3";
 
 export const ContactFormProvider = () => {

src/ui/components/modules/home/components/testimonial/Testimonial.tsx → src/ui/modules/home/components/testimonial/Testimonial.tsx

@@ -2,14 +2,14 @@ import "./testimonial.css";
 import clsx from "clsx";
 import type { ReactNode } from "react";
 
-import { TestimonialAuthor } from "@components/modules/home/components/testimonial/atoms/testimonialAuthor";
-import type { TestimonialAuthorProps } from "@components/modules/home/components/testimonial/atoms/testimonialAuthor";
-import { TestimonialDescription } from "@components/modules/home/components/testimonial/atoms/testimonialDescription";
-import type { TestimonialDescriptionProps } from "@components/modules/home/components/testimonial/atoms/testimonialDescription";
-import { TestimonialImage } from "@components/modules/home/components/testimonial/atoms/testimonialImage";
-import type { TestimonialImageProps } from "@components/modules/home/components/testimonial/atoms/testimonialImage";
-import { TestimonialQuote } from "@components/modules/home/components/testimonial/atoms/testimonialQuote";
-import type { TestimonialQuoteProps } from "@components/modules/home/components/testimonial/atoms/testimonialQuote";
+import { TestimonialAuthor } from "@modules/home/components/testimonial/atoms/testimonialAuthor";
+import type { TestimonialAuthorProps } from "@modules/home/components/testimonial/atoms/testimonialAuthor";
+import { TestimonialDescription } from "@modules/home/components/testimonial/atoms/testimonialDescription";
+import type { TestimonialDescriptionProps } from "@modules/home/components/testimonial/atoms/testimonialDescription";
+import { TestimonialImage } from "@modules/home/components/testimonial/atoms/testimonialImage";
+import type { TestimonialImageProps } from "@modules/home/components/testimonial/atoms/testimonialImage";
+import { TestimonialQuote } from "@modules/home/components/testimonial/atoms/testimonialQuote";
+import type { TestimonialQuoteProps } from "@modules/home/components/testimonial/atoms/testimonialQuote";
 import { useSwiperSlide } from "swiper/react";
 
 interface TestimonialProps {

src/ui/components/modules/home/components/testimonialsSlider/TestimonialsSlider.tsx → src/ui/modules/home/components/testimonialsSlider/TestimonialsSlider.tsx

@@ -1,6 +1,6 @@
 import type { TestimonialDTO } from "@application/dto/testimonial/types.ts";
-import { Testimonial } from "@components/modules/home/components/testimonial";
 import { DEFAULT_SWIPER_CONFIG } from "@const/const.ts";
+import { Testimonial } from "@modules/home/components/testimonial";
 import { Slider } from "@shared/ui/components/slider";
 import { Pagination } from "swiper/modules";
 import type { SwiperOptions } from "swiper/types";

src/ui/components/modules/home/components/welcome/Welcome.astro → src/ui/modules/home/components/welcome/Welcome.astro

@@ -19,7 +19,7 @@ import "./welcome.css";
   </div>
 </section>
 <script is:inline data-astro-rerun type="module">
-  import { initializeParallax } from '/src/ui/components/modules/home/utils/initializeParallax';
+  import { initializeParallax } from '/src/ui/modules/home/utils/initializeParallax';
 
   initializeParallax()
 </script>

tsconfig.paths.json

@@ -8,7 +8,7 @@
 			"@ui/*": ["./src/ui/*"],
 			"@lib/*": ["./src/lib/*"],
 			"@application/*": ["./src/application/*"],
-			"@components/*": ["./src/ui/components/*"],
+			"@modules/*": ["./src/ui/modules/*"],
 			"@utils/*": ["./src/utils/*"],
 			"@assets/*": ["./src/ui/assets/*"],
 			"@styles/*": ["./src/ui/styles/*"],