diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index ded17bf..414b1ac 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,9 +4,9 @@ import localFont from 'next/font/local';
 import { ViewTransitions } from 'next-view-transitions';
 
 import { baseUrl } from '@/app/sitemap';
-import Footer from '@/components/layout/footer';
-import { Navbar } from '@/components/layout/nav';
-import { Providers } from '@/components/providers/providers';
+import Footer from '@/components/core/layout/footer';
+import { Navbar } from '@/components/core/layout/nav';
+import { Providers } from '@/components/core/providers/providers';
 import { createMetadata } from '@/lib/metadata';
 
 const geistSans = localFont({
diff --git a/src/components/layout/footer.tsx b/src/components/core/layout/footer.tsx
similarity index 100%
rename from src/components/layout/footer.tsx
rename to src/components/core/layout/footer.tsx
diff --git a/src/components/layout/nav.tsx b/src/components/core/layout/nav.tsx
similarity index 80%
rename from src/components/layout/nav.tsx
rename to src/components/core/layout/nav.tsx
index 3cb2533..7845b50 100644
--- a/src/components/layout/nav.tsx
+++ b/src/components/core/layout/nav.tsx
@@ -34,7 +34,16 @@ export function Navbar() {
                     className='flex items-center gap-2 p-2'
                     asChild
                   >
-                    <Link href={path} aria-label={`Navigate to ${name}`}>
+                    <Link
+                      href={path}
+                      aria-label={`Navigate to ${name}`}
+                      {...(name.toLowerCase() === 'github'
+                        ? {
+                            target: '_blank',
+                            rel: 'noopener noreferrer'
+                          }
+                        : {})}
+                    >
                       <Icon className='h-4 w-4' aria-hidden='true' />
                       <span className='capitalize'>{name}</span>
                     </Link>
diff --git a/src/components/providers/providers.tsx b/src/components/core/providers/providers.tsx
similarity index 87%
rename from src/components/providers/providers.tsx
rename to src/components/core/providers/providers.tsx
index b8b8f46..e10d5db 100644
--- a/src/components/providers/providers.tsx
+++ b/src/components/core/providers/providers.tsx
@@ -2,8 +2,8 @@
 
 import { Toaster } from 'sonner';
 
+import { ThemeProvider } from '@/components/core/providers/theme-provider';
 import { TabTitleChanger } from '@/components/core/reusable/tab-title-changer';
-import { ThemeProvider } from '@/components/providers/theme-provider';
 import { TooltipProvider } from '@/components/ui/tooltip';
 
 export function Providers({ children }: { children: React.ReactNode }) {
diff --git a/src/components/providers/theme-provider.tsx b/src/components/core/providers/theme-provider.tsx
similarity index 100%
rename from src/components/providers/theme-provider.tsx
rename to src/components/core/providers/theme-provider.tsx