diff --git a/src/components/image/BackgroundPreview.svelte b/src/components/image/BackgroundPreview.svelte
index c480707..e368259 100644
--- a/src/components/image/BackgroundPreview.svelte
+++ b/src/components/image/BackgroundPreview.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Button from "../ui/Button.svelte";
+  import Button from "$components/ui/Button.svelte";
 
   interface Props {
     backgroundImage?: string | undefined;
diff --git a/src/components/image/ImageCropper.svelte b/src/components/image/ImageCropper.svelte
index 1f2288e..ff86bca 100644
--- a/src/components/image/ImageCropper.svelte
+++ b/src/components/image/ImageCropper.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import { onMount } from "svelte";
-  import CropperJS from "cropperjs";
-  import type { ImageCropResult } from "$lib/types/panel";
+  import Button from "$components/ui/Button.svelte";
   import { ImageService } from "$lib/services/imageService";
-  import { uiStore, setLoading } from "../../stores/uiStore";
-  import Button from "../ui/Button.svelte";
+  import type { ImageCropResult } from "$lib/types/panel";
+  import { setLoading } from "$stores/uiStore";
+  import CropperJS from "cropperjs";
+  import { onMount } from "svelte";
 
   interface Props {
     imageSrc: string;
diff --git a/src/components/image/ImageUpload.svelte b/src/components/image/ImageUpload.svelte
index 69d3d1c..599a8f6 100644
--- a/src/components/image/ImageUpload.svelte
+++ b/src/components/image/ImageUpload.svelte
@@ -1,11 +1,10 @@
 <script lang="ts">
-  import { onMount } from "svelte";
-  import { uiStore, setLoading, clearError, setCurrentStep } from "../../stores/uiStore";
-  import { panelStore } from "../../stores/panelStore";
+  import Button from "$components/ui/Button.svelte";
   import { ImageService } from "$lib/services/imageService";
-  import { handleError } from "$lib/utils/errorHandler";
   import type { ImageUploadResult } from "$lib/types/panel";
-  import Button from "../ui/Button.svelte";
+  import { handleError } from "$lib/utils/errorHandler";
+  import { clearError, setCurrentStep, setLoading, uiStore } from "$stores/uiStore";
+  import { onMount } from "svelte";
 
   let imageService = new ImageService();
 
diff --git a/src/components/layout/AppContainer.svelte b/src/components/layout/AppContainer.svelte
index b96190f..1c9856a 100644
--- a/src/components/layout/AppContainer.svelte
+++ b/src/components/layout/AppContainer.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import AppHeader from "./AppHeader.svelte";
-  import ErrorMessage from "../feedback/ErrorMessage.svelte";
-  import AppContent from "./AppContent.svelte";
+  import ErrorMessage from "$components/feedback/ErrorMessage.svelte";
+  import AppContent from "$components/layout/AppContent.svelte";
+  import AppHeader from "$components/layout/AppHeader.svelte";
 
   interface Props {
     errorMessage: string | undefined;
diff --git a/src/components/layout/AppContent.svelte b/src/components/layout/AppContent.svelte
index 826dacb..12ccb89 100644
--- a/src/components/layout/AppContent.svelte
+++ b/src/components/layout/AppContent.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import MainSection from "./MainSection.svelte";
-  import Sidebar from "./Sidebar.svelte";
+  import MainSection from "$components/layout/MainSection.svelte";
+  import Sidebar from "$components/layout/Sidebar.svelte";
 
   interface Props {
     uploadedImage: string | undefined;
diff --git a/src/components/layout/MainSection.svelte b/src/components/layout/MainSection.svelte
index 4408bea..75bc5da 100644
--- a/src/components/layout/MainSection.svelte
+++ b/src/components/layout/MainSection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { uiStore } from "../../stores/uiStore";
-  import ImageManager from "../image/ImageManager.svelte";
-  import TextSection from "../text/TextSection.svelte";
+  import ImageManager from "$components/image/ImageManager.svelte";
+  import TextSection from "$components/text/TextSection.svelte";
+  import { uiStore } from "$stores/uiStore";
 
   interface Props {
     uploadedImage: string | undefined;
diff --git a/src/components/layout/Sidebar.svelte b/src/components/layout/Sidebar.svelte
index 2ab06a7..08ab9f4 100644
--- a/src/components/layout/Sidebar.svelte
+++ b/src/components/layout/Sidebar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { uiStore } from "../../stores/uiStore";
-  import BackgroundPreview from "../image/BackgroundPreview.svelte";
-  import PanelsList from "../panel/PanelsList.svelte";
+  import BackgroundPreview from "$components/image/BackgroundPreview.svelte";
+  import PanelsList from "$components/panel/PanelsList.svelte";
+  import { uiStore } from "$stores/uiStore";
 
   interface Props {
     backgroundImage: string | undefined;
diff --git a/src/components/panel/PanelList.svelte b/src/components/panel/PanelList.svelte
index 946ea82..f76638e 100644
--- a/src/components/panel/PanelList.svelte
+++ b/src/components/panel/PanelList.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import { onMount } from "svelte";
-  import { panelStore } from "../../stores/panelStore";
-  import { panelStorage } from "$lib/utils/panelStorage";
+  import IconButton from "$components/ui/IconButton.svelte";
   import type { Panel } from "$lib/types/panel";
-  import IconButton from "../ui/IconButton.svelte";
+  import { panelStorage } from "$lib/utils/panelStorage";
+  import { panelStore } from "$stores/panelStore";
+  import { onMount } from "svelte";
 
   interface Props {
     onPanelSelect: (panel: Panel) => void;
diff --git a/src/components/panel/PanelPreview.svelte b/src/components/panel/PanelPreview.svelte
index c502788..cc566d7 100644
--- a/src/components/panel/PanelPreview.svelte
+++ b/src/components/panel/PanelPreview.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
+  import Button from "$components/ui/Button.svelte";
   import type { Panel, TextItem } from "$lib/types/panel";
+  import { setCurrentStep } from "$stores/uiStore";
   import { Image, Layer, Stage, Text } from "svelte-konva";
-  import { setCurrentStep } from "../../stores/uiStore";
-  import Button from "../ui/Button.svelte";
 
   interface Props {
     panel: Panel;
diff --git a/src/components/text/TextManager.svelte b/src/components/text/TextManager.svelte
index b354327..a879686 100644
--- a/src/components/text/TextManager.svelte
+++ b/src/components/text/TextManager.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Button from "../ui/Button.svelte";
+  import Button from "$components/ui/Button.svelte";
 
   interface Props {
     onTextAdd: (text: string) => void;
diff --git a/src/components/text/TextPreview.svelte b/src/components/text/TextPreview.svelte
index 7b25cbd..e03b1e5 100644
--- a/src/components/text/TextPreview.svelte
+++ b/src/components/text/TextPreview.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type { TextItem } from "$lib/types/panel";
-  import { panelStore } from "../../stores/panelStore";
-  import { Stage, Layer, Image, Text } from "svelte-konva";
+  import { panelStore } from "$stores/panelStore";
+  import { Image, Layer, Stage, Text } from "svelte-konva";
 
   interface Props {
     textItem: TextItem;