diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4d3132b..0616f4d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -12,6 +12,5 @@
   // https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss
   "editor.quickSuggestions": {
     "strings": "on"
-  },
-  "todo-tree.tree.scanMode": "workspace"
+  }
 }
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 37a2f28..915cb70 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,5 +1,5 @@
-import { APP_TITLE } from '@/core/core.utils';
 import { Layout } from '@/core/layouts/components/layout';
+import { APP_TITLE } from '@/core/shared/utils';
 import '@/core/styles/globals.css';
 import { BaseToastContainer } from '@/core/ui/components/base-toast-container';
 import type { Viewport } from 'next';
diff --git a/src/core/layouts/components/hero.tsx b/src/core/layouts/components/hero.tsx
index 681e005..0da0e23 100644
--- a/src/core/layouts/components/hero.tsx
+++ b/src/core/layouts/components/hero.tsx
@@ -1,4 +1,4 @@
-import { APP_TITLE } from '@/core/core.utils';
+import { APP_TITLE } from '@/core/shared/utils';
 
 export function Hero() {
   return (
diff --git a/src/core/core.types.tsx b/src/core/shared/types.tsx
similarity index 100%
rename from src/core/core.types.tsx
rename to src/core/shared/types.tsx
diff --git a/src/core/core.utils.ts b/src/core/shared/utils.ts
similarity index 100%
rename from src/core/core.utils.ts
rename to src/core/shared/utils.ts
diff --git a/src/core/ui/components/radio-group.tsx b/src/core/ui/components/radio-group.tsx
index 17aa899..73b3396 100644
--- a/src/core/ui/components/radio-group.tsx
+++ b/src/core/ui/components/radio-group.tsx
@@ -1,6 +1,6 @@
 import { createContext, use } from 'react';
 import { twMerge } from 'tailwind-merge';
-import { useFocusVisible } from '../ui.hooks';
+import { useFocusVisible } from '../hooks';
 
 type RadioGroupContextValue = {
   name: string;
diff --git a/src/core/ui/components/ranger.tsx b/src/core/ui/components/ranger.tsx
index c206a53..cece7fd 100644
--- a/src/core/ui/components/ranger.tsx
+++ b/src/core/ui/components/ranger.tsx
@@ -1,5 +1,5 @@
 import { twMerge } from 'tailwind-merge';
-import type { Omit } from '../../core.types';
+import type { Omit } from '../../shared/types';
 
 type RangerProps = Omit<React.ComponentPropsWithoutRef<'input'>, 'type'>;
 
diff --git a/src/core/ui/ui.hooks.ts b/src/core/ui/hooks.ts
similarity index 100%
rename from src/core/ui/ui.hooks.ts
rename to src/core/ui/hooks.ts
diff --git a/src/features/editor/components/editor.tsx b/src/features/editor/components/editor.tsx
index 358d337..8601788 100644
--- a/src/features/editor/components/editor.tsx
+++ b/src/features/editor/components/editor.tsx
@@ -1,4 +1,4 @@
-import type { ThemeName } from '@/features/editor/editor.types';
+import type { ThemeName } from '@/features/editor/types';
 import type { Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 import type { LanguageName } from '@uiw/codemirror-extensions-langs';
diff --git a/src/features/editor/editor.types.ts b/src/features/editor/types.ts
similarity index 100%
rename from src/features/editor/editor.types.ts
rename to src/features/editor/types.ts
diff --git a/src/features/editor/editor.utils.ts b/src/features/editor/utils.ts
similarity index 78%
rename from src/features/editor/editor.utils.ts
rename to src/features/editor/utils.ts
index d6948c2..403cbbb 100644
--- a/src/features/editor/editor.utils.ts
+++ b/src/features/editor/utils.ts
@@ -1,5 +1,5 @@
 import * as themes from '@uiw/codemirror-themes-all';
-import type { ThemeName } from './editor.types';
+import type { ThemeName } from './types';
 
 export const themeNames = Object.keys(themes)
   .filter((themeName) => !themeName.endsWith('Init'))
diff --git a/src/features/exportable-editor/components/settings.tsx b/src/features/exportable-editor/components/settings.tsx
index 1bccc17..f9a419f 100644
--- a/src/features/exportable-editor/components/settings.tsx
+++ b/src/features/exportable-editor/components/settings.tsx
@@ -3,10 +3,7 @@ import { Checkbox } from '@/core/ui/components/checkbox';
 import { Divider } from '@/core/ui/components/divider';
 import { Label } from '@/core/ui/components/label';
 import { Ranger } from '@/core/ui/components/ranger';
-import type {
-  LanguageOption,
-  ThemeOption,
-} from '@/features/editor/editor.types';
+import type { LanguageOption, ThemeOption } from '@/features/editor/types';
 import { BackgroundRadioGroup } from '@/features/exportable-editor/components/background-radio-group';
 import { LanguageSelect } from '@/features/exportable-editor/components/language-select';
 import { ThemeSelect } from '@/features/exportable-editor/components/theme-select';
diff --git a/src/features/exportable-editor/components/theme-select.tsx b/src/features/exportable-editor/components/theme-select.tsx
index 09b45f7..8827289 100644
--- a/src/features/exportable-editor/components/theme-select.tsx
+++ b/src/features/exportable-editor/components/theme-select.tsx
@@ -1,8 +1,8 @@
 import type { BaseSelectProps } from '@/core/ui/components/base-select';
 import { BaseSelect } from '@/core/ui/components/base-select';
 import { Editor } from '@/features/editor/components/editor';
-import type { ThemeOption } from '@/features/editor/editor.types';
-import { themeNames } from '@/features/editor/editor.utils';
+import type { ThemeOption } from '@/features/editor/types';
+import { themeNames } from '@/features/editor/utils';
 import type { OptionProps } from 'react-select';
 import { components } from 'react-select';