diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index aed3edb..9cd2547 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,6 +1,6 @@
 import type { Metadata } from 'next'
 
-import { BaseLayout } from '@core/layouts'
+import { BaseLayout } from '../layouts'
 
 import './globals.css'
 
diff --git a/src/core/constants/index.ts b/src/core/constants/index.ts
deleted file mode 100644
index c2b4e4e..0000000
--- a/src/core/constants/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { BLOG, NEWSLETTER, WIKI, GITHUB } from './urls'
-
-export const Urls = {
-  WIKI,
-  NEWSLETTER,
-  BLOG,
-  GITHUB,
-}
diff --git a/src/core/providers/theme-provider/types.ts b/src/core/providers/theme-provider/types.ts
deleted file mode 100644
index 095f2f2..0000000
--- a/src/core/providers/theme-provider/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { ComponentProps } from 'react'
-
-export interface ThemeProviderProperties extends ComponentProps<'div'> {}
diff --git a/src/core/layouts/base-layout/footer/index.tsx b/src/layouts/base-layout/footer/index.tsx
similarity index 100%
rename from src/core/layouts/base-layout/footer/index.tsx
rename to src/layouts/base-layout/footer/index.tsx
diff --git a/src/core/layouts/base-layout/footer/styles.module.css b/src/layouts/base-layout/footer/styles.module.css
similarity index 100%
rename from src/core/layouts/base-layout/footer/styles.module.css
rename to src/layouts/base-layout/footer/styles.module.css
diff --git a/src/core/constants/urls.ts b/src/layouts/base-layout/header/constants.ts
similarity index 100%
rename from src/core/constants/urls.ts
rename to src/layouts/base-layout/header/constants.ts
diff --git a/src/core/layouts/base-layout/header/index.tsx b/src/layouts/base-layout/header/index.tsx
similarity index 94%
rename from src/core/layouts/base-layout/header/index.tsx
rename to src/layouts/base-layout/header/index.tsx
index faf95f4..18eb913 100644
--- a/src/core/layouts/base-layout/header/index.tsx
+++ b/src/layouts/base-layout/header/index.tsx
@@ -7,7 +7,7 @@ import { Popover, Dialog } from '@headlessui/react'
 import { Bars3Icon, XMarkIcon } from '@heroicons/react/24/outline'
 import classnames from 'classnames'
 
-import { Urls } from '@core/constants'
+import { WIKI, NEWSLETTER, BLOG, GITHUB } from './constants'
 
 import styles from './styles.module.css'
 import { ThemeSelect, ThemeToggle } from './theme'
@@ -46,13 +46,13 @@ export default function Header() {
           <Link
             target="_blank"
             rel="noopener"
-            href={Urls.WIKI}
+            href={WIKI}
             className={styles.link}
           >
             Wiki
           </Link>
           <Link
-            href={Urls.NEWSLETTER}
+            href={NEWSLETTER}
             target="_blank"
             rel="noopener"
             className={styles.link}
@@ -62,7 +62,7 @@ export default function Header() {
           <Link
             target="_blank"
             rel="noopener"
-            href={Urls.BLOG}
+            href={BLOG}
             className={styles.link}
           >
             Blog
@@ -74,7 +74,7 @@ export default function Header() {
           <Link
             target="_blank"
             rel="noopener"
-            href={Urls.GITHUB}
+            href={GITHUB}
             className={styles.link}
           >
             <span className="sr-only">Frontend Garage on GitHub</span>
@@ -133,7 +133,7 @@ export default function Header() {
                 <Link
                   target="_blank"
                   rel="noopener"
-                  href={Urls.WIKI}
+                  href={WIKI}
                   className={styles.mobileLink}
                 >
                   Wiki
@@ -141,7 +141,7 @@ export default function Header() {
                 <Link
                   target="_blank"
                   rel="noopener"
-                  href={Urls.NEWSLETTER}
+                  href={NEWSLETTER}
                   className={styles.mobileLink}
                 >
                   Newsletter
@@ -150,7 +150,7 @@ export default function Header() {
                 <Link
                   target="_blank"
                   rel="noopener"
-                  href={Urls.BLOG}
+                  href={BLOG}
                   className={styles.mobileLink}
                 >
                   Blog
@@ -160,7 +160,7 @@ export default function Header() {
                 <Link
                   target="_blank"
                   rel="noopener"
-                  href={Urls.GITHUB}
+                  href={GITHUB}
                   className={styles.mobileLink}
                 >
                   GitHub
diff --git a/src/core/layouts/base-layout/header/styles.module.css b/src/layouts/base-layout/header/styles.module.css
similarity index 100%
rename from src/core/layouts/base-layout/header/styles.module.css
rename to src/layouts/base-layout/header/styles.module.css
diff --git a/src/core/layouts/base-layout/header/theme/index.tsx b/src/layouts/base-layout/header/theme/index.tsx
similarity index 100%
rename from src/core/layouts/base-layout/header/theme/index.tsx
rename to src/layouts/base-layout/header/theme/index.tsx
diff --git a/src/core/layouts/base-layout/index.tsx b/src/layouts/base-layout/index.tsx
similarity index 90%
rename from src/core/layouts/base-layout/index.tsx
rename to src/layouts/base-layout/index.tsx
index fbca8ad..21a3133 100644
--- a/src/core/layouts/base-layout/index.tsx
+++ b/src/layouts/base-layout/index.tsx
@@ -1,7 +1,7 @@
 'use client'
 import { Inter } from 'next/font/google'
 
-import { ThemeProvider } from '@core/providers'
+import { ThemeProvider } from 'src/providers'
 
 import Header from './header'
 import Footer from './footer'
diff --git a/src/core/layouts/index.ts b/src/layouts/index.ts
similarity index 100%
rename from src/core/layouts/index.ts
rename to src/layouts/index.ts
diff --git a/src/core/providers/index.ts b/src/providers/index.ts
similarity index 100%
rename from src/core/providers/index.ts
rename to src/providers/index.ts
diff --git a/src/core/providers/theme-provider/index.tsx b/src/providers/theme-provider/index.tsx
similarity index 72%
rename from src/core/providers/theme-provider/index.tsx
rename to src/providers/theme-provider/index.tsx
index 29b786e..a091fe1 100644
--- a/src/core/providers/theme-provider/index.tsx
+++ b/src/providers/theme-provider/index.tsx
@@ -1,11 +1,10 @@
 'use client'
 
 import { useEffect, useState } from 'react'
+import type { ComponentProps } from 'react'
 import { ThemeProvider as NextThemeProvider } from 'next-themes'
 
-import type { ThemeProviderProperties } from './types'
-
-export default function ThemeProvider({ children }: ThemeProviderProperties) {
+export default function ThemeProvider({ children }: ComponentProps<'div'>) {
   const [mounted, setMounted] = useState<boolean>(false)
 
   useEffect(() => {
diff --git a/tailwind.config.ts b/tailwind.config.ts
index f348dc4..d5ed3fe 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -5,7 +5,8 @@ const config: Config = {
   content: [
     './src/pages/**/*.{js,ts,jsx,tsx,mdx}',
     './src/app/**/*.{js,ts,jsx,tsx,mdx}',
-    './src/core/**/*.{js,ts,jsx,tsx,mdx}',
+    './src/layouts/**/*.{js,ts,jsx,tsx,mdx}',
+    './src/providers/**/*.{js,ts,jsx,tsx,mdx}',
   ],
   theme: {
     extend: {
diff --git a/tsconfig.json b/tsconfig.json
index 167ceff..e47061b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,8 +19,7 @@
       }
     ],
     "paths": {
-      "@core/*": ["./src/core/*"],
-      "@features/*": ["./src/features/*"]
+      "src/*": ["./src/*"]
     }
   },
   "include": [