diff --git a/frontend/README.md b/frontend/README.md
deleted file mode 100644
index 33895ab2..00000000
--- a/frontend/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Vue 3 + TypeScript + Vite
-
-This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
-
-Learn more about the recommended Project Setup and IDE Support in the [Vue Docs TypeScript Guide](https://vuejs.org/guide/typescript/overview.html#project-setup).
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 89ac660a..91ab4aa9 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -34,6 +34,8 @@ const layout = computed(() => {
     return DefaultLayout;
 });
 
+// TODO: Move these loading message helpers to core
+
 // Loading message helpers
 const getAuthLoadingTitle = () => {
     if (authStore.retryingAuth) {
diff --git a/frontend/src/components/annotationWorkspace/AnnotationCanvas.vue b/frontend/src/components/annotationWorkspace/AnnotationCanvas.vue
index dfbfd1d7..244f6293 100644
--- a/frontend/src/components/annotationWorkspace/AnnotationCanvas.vue
+++ b/frontend/src/components/annotationWorkspace/AnnotationCanvas.vue
@@ -25,19 +25,28 @@
 <script setup lang="ts">
 import {computed, nextTick, onBeforeUnmount, onMounted, ref, watch} from "vue";
 import {useWorkspaceStore} from '@/stores/workspaceStore';
-import type {Point} from "@/types/common/point";
-import {ToolName} from "@/types/workspace/tools";
-import {AnnotationManager} from "@/core/annotationWorkspace/annotationManager";
-import {StoreError, ToolError} from "@/types/common/errors";
+import type {Point} from "@/core/geometry/geometry.types";
+import {ToolName} from "@/core/workspace/tools.types";
+import {
+    AnnotationManager,
+    findAnnotationAtPoint,
+    updateAnnotationPointLocally,
+    calculateCanvasDimensions,
+    calculateCenterAndFitView,
+    mouseToImageCoordinates,
+    calculateZoomFromWheel,
+    calculateZoomViewOffset,
+    calculateCanvasCursorStyle,
+    renderAnnotation,
+    type AnnotationRenderContext,
+    getAnnotationDisplayColor,
+    separateAnnotationsBySelection
+} from "@/core/workspace";
+import {StoreError, ToolError} from "@/core/errors/errors";
 import AlertModal from "../common/modal/AlertModal.vue";
 import {useAlert} from "@/composables/useAlert";
-import {AppLogger} from "@/utils/logger";
-import {findAnnotationAtPoint} from '@/core/annotationWorkspace/hitDetection';
-import {updateAnnotationPointLocally} from '@/core/annotationWorkspace/coordinateTransforms';
-import {calculateCanvasDimensions, calculateCenterAndFitView, mouseToImageCoordinates, calculateZoomFromWheel, calculateZoomViewOffset} from '@/core/annotationWorkspace/viewport';
-import {calculateCanvasCursorStyle} from '@/core/annotationWorkspace/cursors';
-import {renderAnnotation, type AnnotationRenderContext} from '@/core/annotationWorkspace/annotationRenderer';
-import {getAnnotationDisplayColor, separateAnnotationsBySelection} from '@/core/annotationWorkspace/annotationDisplayUtils';
+import {AppLogger} from "@/core/logger/logger";
+import type { Annotation } from "@/core/workspace/annotation.types";
 
 const logger = AppLogger.createComponentLogger('AnnotationCanvas');
 
@@ -275,7 +284,7 @@ const drawSavedAnnotations = (context: CanvasRenderingContext2D) => {
 
 // Function to save annotation changes to backend
 const saveAnnotationChanges = async (annotationId: number) => {
-    const annotation = annotationsToRender.value?.find(a => a.annotationId === annotationId);
+    const annotation = annotationsToRender.value?.find((a: Annotation) => a.annotationId === annotationId);
     if (!annotation || !annotation.coordinates) return;
 
     try {
@@ -373,7 +382,7 @@ const handleMouseMove = (event: MouseEvent) => {
     if (activeTool.value === ToolName.CURSOR) {
         if (isDraggingHandle.value && selectedAnnotationId.value !== null) {
             // Handle dragging - update annotation coordinates locally only
-            const annotation = annotationsToRender.value?.find(a => a.annotationId === selectedAnnotationId.value);
+            const annotation = annotationsToRender.value?.find((a: Annotation) => a.annotationId === selectedAnnotationId.value);
             if (annotation) {
                 const imageDims = workspaceStore.getCurrentAsset && workspaceStore.getCurrentAsset.width && workspaceStore.getCurrentAsset.height
                     ? { width: workspaceStore.getCurrentAsset.width, height: workspaceStore.getCurrentAsset.height }
diff --git a/frontend/src/components/annotationWorkspace/AnnotationsPanel.vue b/frontend/src/components/annotationWorkspace/AnnotationsPanel.vue
index 8a5000eb..00ea773f 100644
--- a/frontend/src/components/annotationWorkspace/AnnotationsPanel.vue
+++ b/frontend/src/components/annotationWorkspace/AnnotationsPanel.vue
@@ -152,9 +152,9 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 import { useWorkspaceStore } from '@/stores/workspaceStore';
-import type { Annotation } from '@/types/workspace/annotation';
-import { AnnotationType } from '@/types/workspace/annotation';
-import type { Label } from '@/types/label/label';
+import type { Annotation } from '@/core/workspace/annotation.types';
+import { AnnotationType } from '@/core/workspace/annotation.types';
+import type { Label } from '@/services/project/labelScheme/label.types';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { 
     faEye, 
@@ -169,7 +169,7 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import ModalWindow from '@/components/common/modal/ModalWindow.vue';
 import Button from '@/components/common/Button.vue';
-import {AppLogger} from "@/utils/logger";
+import {AppLogger} from "@/core/logger/logger";
 
 const logger = AppLogger.createComponentLogger('AnnotationCanvas');
 
diff --git a/frontend/src/components/annotationWorkspace/WorkspaceSidebar.vue b/frontend/src/components/annotationWorkspace/WorkspaceSidebar.vue
index eb455d9a..99ea6c8d 100644
--- a/frontend/src/components/annotationWorkspace/WorkspaceSidebar.vue
+++ b/frontend/src/components/annotationWorkspace/WorkspaceSidebar.vue
@@ -99,10 +99,12 @@
 <script setup lang="ts">
 import { computed, ref, watch, onMounted, onUnmounted } from 'vue';
 import { useWorkspaceStore } from '@/stores/workspaceStore';
-import { ToolName } from '@/types/workspace/tools';
+import { ToolName } from '@/core/workspace/tools.types';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import Button from '@/components/common/Button.vue';
-import { AppLogger } from '@/utils/logger';
+import { AppLogger } from '@/core/logger/logger';
+import type { Label } from '@/services/project/labelScheme/label.types';
+import type { Annotation } from '@/core/workspace/annotation.types';
 
 const logger = AppLogger.createComponentLogger('WorkspaceSidebar');
 
@@ -128,7 +130,7 @@ const filteredLabels = computed(() => {
     }
     
     const query = labelSearchQuery.value.toLowerCase().trim();
-    return availableLabels.value.filter(label => 
+    return availableLabels.value.filter((label: Label) => 
         label.name.toLowerCase().includes(query) ||
         (label.description && label.description.toLowerCase().includes(query))
     );
@@ -155,10 +157,10 @@ const selectLabel = (labelId: number) => {
 
 // Helper functions
 const getLabelUsageCount = (labelId: number): number => {
-    return annotations.value.filter(annotation => annotation.labelId === labelId).length;
+    return annotations.value.filter((annotation: Annotation) => annotation.labelId === labelId).length;
 };
 
-const getLabelTooltip = (label: any, index: number): string => {
+const getLabelTooltip = (label: Label, index: number): string => {
     const usageCount = getLabelUsageCount(label.labelId);
     const shortcut = index < 9 ? ` (Press ${index + 1})` : '';
     const usage = usageCount > 0 ? ` • ${usageCount} annotations` : '';
diff --git a/frontend/src/components/common/AnimatedCounter.vue b/frontend/src/components/common/AnimatedCounter.vue
deleted file mode 100644
index 6fff62d2..00000000
--- a/frontend/src/components/common/AnimatedCounter.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<template>
-    <span class="animated-counter">{{ displayValue }}</span>
-</template>
-
-<script setup lang="ts">
-import {onMounted, ref, watch} from 'vue';
-import {animateValue, formatNumber} from '@/utils/charts';
-
-interface Props {
-    value: number;
-    duration?: number;
-    formatted?: boolean;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    duration: 1000,
-    formatted: false
-});
-
-const displayValue = ref(0);
-
-const animateToValue = (targetValue: number) => {
-    animateValue(
-        displayValue.value,
-        targetValue,
-        props.duration,
-        (currentValue) => {
-            displayValue.value = props.formatted ? 
-                parseInt(formatNumber(currentValue).replace(/[^\d]/g, '')) : 
-                currentValue;
-        }
-    );
-};
-
-onMounted(() => {
-    animateToValue(props.value);
-});
-
-watch(() => props.value, (newValue) => {
-    animateToValue(newValue);
-});
-</script>
-
-<style scoped>
-.animated-counter {
-    font-weight: bold;
-    transition: all 0.3s ease;
-}
-</style>
diff --git a/frontend/src/components/common/DataTable.vue b/frontend/src/components/common/DataTable.vue
index 88e755fe..64c933c3 100644
--- a/frontend/src/components/common/DataTable.vue
+++ b/frontend/src/components/common/DataTable.vue
@@ -157,7 +157,7 @@ import {
     faSortUp
 } from '@fortawesome/free-solid-svg-icons';
 import Button from '@/components/common/Button.vue';
-import type {TableAction, TableColumn, TablePagination, TableRowAction} from '@/types/common';
+import type {TableAction, TableColumn, TablePagination, TableRowAction} from '@/core/table/table.types';
 
 interface Props {
     data: T[];
diff --git a/frontend/src/components/common/PageLoader.vue b/frontend/src/components/common/PageLoader.vue
index d258c2fb..7e640083 100644
--- a/frontend/src/components/common/PageLoader.vue
+++ b/frontend/src/components/common/PageLoader.vue
@@ -34,9 +34,16 @@
 </template>
 
 <script setup lang="ts">
-import type { PageLoaderProps } from '@/types/components/pageLoader';
+export interface Props {
+    title?: string;
+    subtitle?: string;
+    message?: string;
+    showProgress?: boolean;
+    progress?: number;
+    transparent?: boolean;
+}
 
-withDefaults(defineProps<PageLoaderProps>(), {
+withDefaults(defineProps<Props>(), {
     title: 'Loading...',
     subtitle: '',
     message: '',
diff --git a/frontend/src/components/common/toast/ToastNotification.vue b/frontend/src/components/common/toast/ToastNotification.vue
index f64323c4..a172bab1 100644
--- a/frontend/src/components/common/toast/ToastNotification.vue
+++ b/frontend/src/components/common/toast/ToastNotification.vue
@@ -55,7 +55,7 @@ import {
     faInfoCircle,
     faTimes
 } from '@fortawesome/free-solid-svg-icons';
-import type {Toast} from '@/types/toast';
+import type {Toast} from '@/composables/useToast';
 
 const props = defineProps<{
     toast: Toast;
diff --git a/frontend/src/components/project/AssetThumbnail.vue b/frontend/src/components/project/AssetThumbnail.vue
index a6ec3f4d..cb662f87 100644
--- a/frontend/src/components/project/AssetThumbnail.vue
+++ b/frontend/src/components/project/AssetThumbnail.vue
@@ -58,12 +58,12 @@
 </template>
 
 <script setup lang="ts">
-import {computed, ref} from 'vue';
-import {useRoute} from 'vue-router';
-import type {Asset} from '@/types/asset/asset';
+import { computed, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import type { Asset } from '@/core/asset/asset.types';
 import Card from '@/components/common/Card.vue';
 import Button from '@/components/common/Button.vue';
-import {AppLogger} from '@/utils/logger';
+import { AppLogger } from '@/core/logger/logger';
 
 const logger = AppLogger.createComponentLogger('AssetThumbnail');
 
diff --git a/frontend/src/components/project/CreateProjectForm.vue b/frontend/src/components/project/CreateProjectForm.vue
index 43059575..d321a293 100644
--- a/frontend/src/components/project/CreateProjectForm.vue
+++ b/frontend/src/components/project/CreateProjectForm.vue
@@ -28,7 +28,7 @@
 import {ref} from 'vue';
 import Form from '@/components/common/Form.vue';
 import Button from '@/components/common/Button.vue';
-import {ProjectType} from '@/types/project/project';
+import {ProjectType} from '@/services/project/project.types';
 import {useToast} from '@/composables/useToast';
 
 const { showWarning } = useToast();
diff --git a/frontend/src/components/project/ProjectCard.vue b/frontend/src/components/project/ProjectCard.vue
index be13229a..896fe96a 100644
--- a/frontend/src/components/project/ProjectCard.vue
+++ b/frontend/src/components/project/ProjectCard.vue
@@ -24,7 +24,7 @@
 
 <script setup lang="ts">
 import {computed} from "vue";
-import type {Project} from "@/types/project/project";
+import type {Project} from "@/services/project/project.types";
 import Card from "@/components/common/Card.vue";
 
 const props = defineProps<{
diff --git a/frontend/src/components/project/UploadImagesModal.vue b/frontend/src/components/project/UploadImagesModal.vue
index 273540d9..db0bc6b7 100644
--- a/frontend/src/components/project/UploadImagesModal.vue
+++ b/frontend/src/components/project/UploadImagesModal.vue
@@ -163,13 +163,13 @@
 import {computed, ref} from 'vue';
 import ModalWindow from '@/components/common/modal/ModalWindow.vue';
 import Button from '@/components/common/Button.vue';
-import type {DataSource} from '@/types/dataSource/dataSource';
-import {NoFilesProvidedError, UploadError} from '@/types/asset';
-import {ApiResponseError, NetworkError, ServerError} from '@/types/common/errors';
-import {AppLogger} from '@/utils/logger';
+import type {DataSource} from '@/services/project/dataSource/dataSource.types';
+import {NoFilesProvidedError, UploadError} from '@/services/project/asset';
+import {ApiResponseError, NetworkError, ServerError} from '@/core/errors/errors';
+import {AppLogger} from '@/core/logger/logger';
 import {useAlert} from '@/composables/useAlert';
 import {useToast} from '@/composables/useToast';
-import {assetService} from '@/services/api/projects';
+import {assetService} from '@/services/project';
 
 const logger = AppLogger.createComponentLogger('UploadImagesModal');
 
diff --git a/frontend/src/components/project/dashboard/AddWidgetModal.vue b/frontend/src/components/project/dashboard/AddWidgetModal.vue
index 78653ad2..09e1d3c0 100644
--- a/frontend/src/components/project/dashboard/AddWidgetModal.vue
+++ b/frontend/src/components/project/dashboard/AddWidgetModal.vue
@@ -145,7 +145,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import ModalWindow from "@/components/common/modal/ModalWindow.vue";
 import Button from "@/components/common/Button.vue";
-import type { WidgetDefinitionDto } from "@/types/dashboard/dashboard";
+import type { WidgetDefinitionDto } from "@/services/project/dashboard/dashboard.types";
 
 interface Props {
     widgetDefinitions: WidgetDefinitionDto[];
diff --git a/frontend/src/components/project/dashboard/DashboardGrid.vue b/frontend/src/components/project/dashboard/DashboardGrid.vue
index 8597101e..79d1c216 100644
--- a/frontend/src/components/project/dashboard/DashboardGrid.vue
+++ b/frontend/src/components/project/dashboard/DashboardGrid.vue
@@ -74,7 +74,7 @@ import 'gridstack/dist/gridstack.min.css';
 import WidgetContainer from "./WidgetContainer.vue";
 import AddWidgetModal from "./AddWidgetModal.vue";
 import WidgetSettingsModal from "./WidgetSettingsModal.vue";
-import type { WidgetInstanceDto, WidgetDefinitionDto } from "@/types/dashboard/dashboard";
+import type { WidgetInstanceDto, WidgetDefinitionDto } from "@/services/project/dashboard/dashboard.types";
 
 // Widget Components (same as before)
 import ProjectHealthWidget from "./widgets/ProjectHealthWidget.vue";
diff --git a/frontend/src/components/project/dashboard/WidgetContainer.vue b/frontend/src/components/project/dashboard/WidgetContainer.vue
index e608610c..ba59eb5d 100644
--- a/frontend/src/components/project/dashboard/WidgetContainer.vue
+++ b/frontend/src/components/project/dashboard/WidgetContainer.vue
@@ -72,7 +72,7 @@
 <script setup lang="ts">
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { faCog, faRefresh, faTimes, faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
-import type { WidgetInstanceDto } from "@/types/dashboard/dashboard";
+import type { WidgetInstanceDto } from "@/services/project/dashboard/dashboard.types";
 import Button from "@/components/common/Button.vue";
 
 interface Props {
diff --git a/frontend/src/components/project/dashboard/WidgetSettingsModal.vue b/frontend/src/components/project/dashboard/WidgetSettingsModal.vue
index 50651441..eeca4bbd 100644
--- a/frontend/src/components/project/dashboard/WidgetSettingsModal.vue
+++ b/frontend/src/components/project/dashboard/WidgetSettingsModal.vue
@@ -144,7 +144,7 @@ import type {
     WidgetInstanceDto,
     WidgetDefinitionDto,
     WidgetSettingDto,
-} from "@/types/dashboard/dashboard";
+} from "@/services/project/dashboard/dashboard.types";
 
 interface Props {
     widget: WidgetInstanceDto;
diff --git a/frontend/src/components/project/dashboard/widgets/ProjectHealthWidget.vue b/frontend/src/components/project/dashboard/widgets/ProjectHealthWidget.vue
index ee0768f5..22418d2f 100644
--- a/frontend/src/components/project/dashboard/widgets/ProjectHealthWidget.vue
+++ b/frontend/src/components/project/dashboard/widgets/ProjectHealthWidget.vue
@@ -151,7 +151,7 @@ import {
     faExclamationTriangle 
 } from "@fortawesome/free-solid-svg-icons";
 import * as d3 from "d3";
-import type { ProjectHealthDto } from "@/types/dashboard/dashboard";
+import type { ProjectHealthDto } from "@/services/project/dashboard/dashboard.types";
 
 interface Props {
     data?: ProjectHealthDto;
diff --git a/frontend/src/components/project/dashboard/widgets/RecentActivitiesWidget.vue b/frontend/src/components/project/dashboard/widgets/RecentActivitiesWidget.vue
index a0d16f09..dcc68993 100644
--- a/frontend/src/components/project/dashboard/widgets/RecentActivitiesWidget.vue
+++ b/frontend/src/components/project/dashboard/widgets/RecentActivitiesWidget.vue
@@ -64,7 +64,7 @@
 </template>
 
 <script setup lang="ts">
-import type { RecentActivityDto } from "@/types/dashboard/dashboard";
+import type { RecentActivityDto } from "@/services/project/dashboard/dashboard.types";
 
 interface Props {
     data?: RecentActivityDto[];
diff --git a/frontend/src/components/project/dashboard/widgets/TaskStatisticsWidget.vue b/frontend/src/components/project/dashboard/widgets/TaskStatisticsWidget.vue
index c3e4a046..6186775b 100644
--- a/frontend/src/components/project/dashboard/widgets/TaskStatisticsWidget.vue
+++ b/frontend/src/components/project/dashboard/widgets/TaskStatisticsWidget.vue
@@ -90,7 +90,7 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted, watch } from "vue";
 import * as d3 from "d3";
-import type { TaskStatisticsDto } from "@/types/dashboard/dashboard";
+import type { TaskStatisticsDto } from "@/services/project/dashboard/dashboard.types";
 
 interface Props {
     data?: TaskStatisticsDto;
diff --git a/frontend/src/components/project/dashboard/widgets/UserPerformanceWidget.vue b/frontend/src/components/project/dashboard/widgets/UserPerformanceWidget.vue
index c5ff0ef0..39c0a634 100644
--- a/frontend/src/components/project/dashboard/widgets/UserPerformanceWidget.vue
+++ b/frontend/src/components/project/dashboard/widgets/UserPerformanceWidget.vue
@@ -194,7 +194,7 @@
 <script setup lang="ts">
 import { computed, ref, onMounted, onUnmounted, watch } from "vue";
 import * as d3 from "d3";
-import type { UserPerformanceDto } from "@/types/dashboard/dashboard";
+import type { UserPerformanceDto } from "@/services/project/dashboard/dashboard.types";
 
 interface Props {
     data?: UserPerformanceDto[];
diff --git a/frontend/src/components/project/dashboard/widgets/WorkflowProgressWidget.vue b/frontend/src/components/project/dashboard/widgets/WorkflowProgressWidget.vue
index 1930f5f0..ad48cebb 100644
--- a/frontend/src/components/project/dashboard/widgets/WorkflowProgressWidget.vue
+++ b/frontend/src/components/project/dashboard/widgets/WorkflowProgressWidget.vue
@@ -129,7 +129,7 @@
 <script setup lang="ts">
 import { computed, ref, onMounted, onUnmounted, watch } from "vue";
 import * as d3 from "d3";
-import type { WorkflowProgressDto } from "@/types/dashboard/dashboard";
+import type { WorkflowProgressDto } from "@/services/project/dashboard/dashboard.types";
 
 interface Props {
     data?: WorkflowProgressDto[];
diff --git a/frontend/src/components/project/dataSource/CreateDataSourceForm.vue b/frontend/src/components/project/dataSource/CreateDataSourceForm.vue
index 06dd978d..2c694d9f 100644
--- a/frontend/src/components/project/dataSource/CreateDataSourceForm.vue
+++ b/frontend/src/components/project/dataSource/CreateDataSourceForm.vue
@@ -33,9 +33,9 @@
 import { ref, onMounted } from 'vue';
 import Form from '@/components/common/Form.vue';
 import Button from '@/components/common/Button.vue';
-import { DataSourceType, type CreateDataSourceRequest } from '@/types/dataSource';
+import { DataSourceType, type CreateDataSourceRequest } from '@/services/project/dataSource/dataSource.types';
 import { useToast } from '@/composables/useToast';
-import { dataSourceService } from '@/services/api/projects';
+import { dataSourceService } from '@/services/project';
 
 const { showWarning, showError, showApiError } = useToast();
 
diff --git a/frontend/src/components/project/dataSource/DataSourceCard.vue b/frontend/src/components/project/dataSource/DataSourceCard.vue
index abafc4f6..5e490185 100644
--- a/frontend/src/components/project/dataSource/DataSourceCard.vue
+++ b/frontend/src/components/project/dataSource/DataSourceCard.vue
@@ -55,7 +55,7 @@
 import {computed, ref} from "vue";
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 import {faEye, faUpload, faDownload, faDatabase} from '@fortawesome/free-solid-svg-icons';
-import type {DataSource} from "@/types/dataSource/dataSource";
+import type {DataSource} from "@/services/project/dataSource/dataSource.types";
 import Card from "@/components/common/Card.vue";
 import Button from "@/components/common/Button.vue";
 import UploadImagesModal from "@/components/project/UploadImagesModal.vue";
diff --git a/frontend/src/components/project/labels/CreateLabelForm.vue b/frontend/src/components/project/labels/CreateLabelForm.vue
index 9901c3a5..fb838fd7 100644
--- a/frontend/src/components/project/labels/CreateLabelForm.vue
+++ b/frontend/src/components/project/labels/CreateLabelForm.vue
@@ -86,8 +86,8 @@ import {computed, ref} from 'vue';
 import Form from '@/components/common/Form.vue';
 import Button from '@/components/common/Button.vue';
 import LabelChip from './LabelChip.vue';
-import type {CreateLabelRequest} from '@/types/label/requests';
-import {generateRandomColor, isValidHexColor} from '@/utils/colors';
+import type {CreateLabelRequest} from '@/services/project/labelScheme/label.types';
+import {generateRandomColor, isValidHexColor} from '@/core/theming';
 
 const props = defineProps<{
     disabled?: boolean;
diff --git a/frontend/src/components/project/labels/CreateLabelSchemeForm.vue b/frontend/src/components/project/labels/CreateLabelSchemeForm.vue
index badef0a5..60b074f3 100644
--- a/frontend/src/components/project/labels/CreateLabelSchemeForm.vue
+++ b/frontend/src/components/project/labels/CreateLabelSchemeForm.vue
@@ -44,7 +44,7 @@
 import {ref, computed, watch} from "vue";
 import Form from "@/components/common/Form.vue";
 import Button from "@/components/common/Button.vue";
-import type {FormPayloadLabelScheme, LabelScheme} from "@/types/label/labelScheme";
+import type {FormPayloadLabelScheme, LabelScheme} from "@/services/project/labelScheme/label.types";
 import {useAlert} from "@/composables/useAlert";
 
 const props = defineProps<{
diff --git a/frontend/src/components/project/labels/DeletionImpactDialog.vue b/frontend/src/components/project/labels/DeletionImpactDialog.vue
index 27046a01..1686ecb8 100644
--- a/frontend/src/components/project/labels/DeletionImpactDialog.vue
+++ b/frontend/src/components/project/labels/DeletionImpactDialog.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script setup lang="ts">
-import type { LabelSchemeDeletionImpact } from '@/types/label/labelScheme';
+import type { LabelSchemeDeletionImpact } from '@/services/project/labelScheme/label.types';
 import Button from '@/components/common/Button.vue';
 
 defineProps<{
diff --git a/frontend/src/components/project/labels/LabelChip.vue b/frontend/src/components/project/labels/LabelChip.vue
index 1a7ca794..bfb73353 100644
--- a/frontend/src/components/project/labels/LabelChip.vue
+++ b/frontend/src/components/project/labels/LabelChip.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import {computed} from 'vue';
-import type {Label} from '@/types/label/label';
+import type {Label} from '@/services/project/labelScheme/label.types';
 
 const props = defineProps<{
     label: Label;
diff --git a/frontend/src/components/project/labels/LabelSchemeCard.vue b/frontend/src/components/project/labels/LabelSchemeCard.vue
index 585870c2..969e5096 100644
--- a/frontend/src/components/project/labels/LabelSchemeCard.vue
+++ b/frontend/src/components/project/labels/LabelSchemeCard.vue
@@ -68,18 +68,16 @@
 
 <script setup lang="ts">
 import {onMounted, ref} from 'vue';
-import type {LabelScheme} from '@/types/label/labelScheme';
-import type {Label} from '@/types/label/label';
-import type {CreateLabelRequest} from '@/types/label/requests';
-import {labelService} from '@/services/api/projects/labelService';
+import type {LabelScheme, Label, CreateLabelRequest} from '@/services/project/labelScheme/label.types';
+import {labelService} from '@/services/project';
 import {useToast} from '@/composables/useToast';
 import LabelChip from './LabelChip.vue';
 import CreateLabelForm from './CreateLabelForm.vue';
 import Button from '@/components/common/Button.vue';
 import Card from '@/components/common/Card.vue';
 import ModalWindow from '@/components/common/modal/ModalWindow.vue';
-import {AppLogger} from '@/utils/logger';
-import {PERMISSIONS} from '@/types/permissions';
+import {AppLogger} from '@/core/logger/logger';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
 
 const logger = AppLogger.createComponentLogger('LabelSchemeCard');
 
diff --git a/frontend/src/components/project/settings/MembersSection.vue b/frontend/src/components/project/settings/MembersSection.vue
index 8259fa8e..bafa0b20 100644
--- a/frontend/src/components/project/settings/MembersSection.vue
+++ b/frontend/src/components/project/settings/MembersSection.vue
@@ -167,15 +167,15 @@ import {computed, onMounted, reactive, ref} from 'vue';
 import Card from '@/components/common/Card.vue';
 import Button from '@/components/common/Button.vue';
 import Form from '@/components/common/Form.vue';
-import {projectMemberService} from '@/services/api/projects';
+import {projectMemberService} from '@/services/project';
 import {useToast} from '@/composables/useToast';
 import {useConfirm} from '@/composables/useConfirm';
 import {useErrorHandler} from '@/composables/useErrorHandler';
 import {useAuthStore} from '@/stores/authStore';
-import {AppLogger} from '@/utils/logger';
-import type {InviteMemberRequest, ProjectMember} from '@/types/projectMember';
-import {ProjectRole} from '@/types/project';
-import {PERMISSIONS} from '@/types/permissions';
+import {AppLogger} from '@/core/logger/logger';
+import type {InviteMemberRequest, ProjectMember} from '@/services/project/projectMember.types';
+import {ProjectRole} from '@/services/project/project.types';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
 
 const logger = AppLogger.createComponentLogger('MembersSection');
 
diff --git a/frontend/src/components/project/task/AssetPreviewPopup.vue b/frontend/src/components/project/task/AssetPreviewPopup.vue
index 79c6f1da..3170d7a6 100644
--- a/frontend/src/components/project/task/AssetPreviewPopup.vue
+++ b/frontend/src/components/project/task/AssetPreviewPopup.vue
@@ -103,7 +103,7 @@
 <script setup lang="ts">
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { faRefresh, faExclamationTriangle, faShapes } from '@fortawesome/free-solid-svg-icons';
-import type { TaskTableRow } from '@/types/task';
+import type { TaskTableRow } from '@/services/project/task/task.types';
 import { useAssetPreview } from '@/composables/useAssetPreview';
 
 interface Props {
diff --git a/frontend/src/components/project/task/AssetThumbnailCell.vue b/frontend/src/components/project/task/AssetThumbnailCell.vue
index 7f9a0f56..42c9b01f 100644
--- a/frontend/src/components/project/task/AssetThumbnailCell.vue
+++ b/frontend/src/components/project/task/AssetThumbnailCell.vue
@@ -86,7 +86,7 @@
 <script setup lang="ts">
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { faRefresh, faExclamationTriangle, faShapes } from '@fortawesome/free-solid-svg-icons';
-import type { TaskTableRow } from '@/types/task';
+import type { TaskTableRow } from '@/services/project/task/task.types';
 import { useAssetPreview } from '@/composables/useAssetPreview';
 
 interface Props {
diff --git a/frontend/src/components/project/task/EditTaskModal.vue b/frontend/src/components/project/task/EditTaskModal.vue
index dee9eca8..7bb21ea9 100644
--- a/frontend/src/components/project/task/EditTaskModal.vue
+++ b/frontend/src/components/project/task/EditTaskModal.vue
@@ -115,13 +115,13 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { faTimes } from '@fortawesome/free-solid-svg-icons';
 import Button from '@/components/common/Button.vue';
 import TaskStatusBadge from './TaskStatusBadge.vue';
-import type { TaskTableRow, UpdateTaskRequest } from '@/types/task';
-import { TaskStatus } from '@/types/task';
-import type { ProjectMember } from '@/types/projectMember';
-import { taskService } from '@/services/api/projects';
+import type { TaskTableRow, UpdateTaskRequest } from '@/services/project/task/task.types';
+import { TaskStatus } from '@/services/project/task/task.types';
+import type { ProjectMember } from '@/services/project/projectMember.types';
+import { taskService } from '@/services/project';
 import { useProjectStore } from '@/stores/projectStore';
 import { useErrorHandler } from '@/composables/useErrorHandler';
-import { AppLogger } from '@/utils/logger';
+import { AppLogger } from '@/core/logger/logger';
 
 interface Props {
     show: boolean;
diff --git a/frontend/src/components/project/task/TaskAssignModal.vue b/frontend/src/components/project/task/TaskAssignModal.vue
index ab512cdf..dda1b8cf 100644
--- a/frontend/src/components/project/task/TaskAssignModal.vue
+++ b/frontend/src/components/project/task/TaskAssignModal.vue
@@ -67,13 +67,13 @@
 import { ref, computed, watch } from 'vue';
 import ModalWindow from '@/components/common/modal/ModalWindow.vue';
 import Button from '@/components/common/Button.vue';
-import type { TaskTableRow } from '@/types/task';
-import type { ProjectMember } from '@/types/projectMember/projectMember';
+import type { TaskTableRow } from '@/services/project/task/task.types';
+import type { ProjectMember } from '@/services/project/projectMember.types';
 import { useProjectStore } from '@/stores/projectStore';
 import { useAuthStore } from '@/stores/authStore';
-import { taskService } from '@/services/api/projects';
-import { AppLogger } from '@/utils/logger';
-import type { ProjectRole } from '@/types/project/project';
+import { taskService } from '@/services/project';
+import { AppLogger } from '@/core/logger/logger';
+import type { ProjectRole } from '@/services/project/project.types';
 
 interface Props {
     show: boolean;
diff --git a/frontend/src/components/project/task/TaskBulkOperationsToolbar.vue b/frontend/src/components/project/task/TaskBulkOperationsToolbar.vue
index 8d95147c..b08a065f 100644
--- a/frontend/src/components/project/task/TaskBulkOperationsToolbar.vue
+++ b/frontend/src/components/project/task/TaskBulkOperationsToolbar.vue
@@ -116,7 +116,7 @@ import {
     faSpinner
 } from '@fortawesome/free-solid-svg-icons';
 import Button from '@/components/common/Button.vue';
-import type { ProjectMember } from '@/types/projectMember/projectMember';
+import type { ProjectMember } from '@/services/project/projectMember.types';
 
 interface Props {
     /** Number of selected tasks */
diff --git a/frontend/src/components/project/task/TaskPriorityModal.vue b/frontend/src/components/project/task/TaskPriorityModal.vue
index 81485326..6b71d642 100644
--- a/frontend/src/components/project/task/TaskPriorityModal.vue
+++ b/frontend/src/components/project/task/TaskPriorityModal.vue
@@ -69,9 +69,9 @@ import Button from '@/components/common/Button.vue';
 import TaskPriorityCell from './TaskPriorityCell.vue';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { faExclamationTriangle, faArrowUp, faMinus } from '@fortawesome/free-solid-svg-icons';
-import type { TaskTableRow } from '@/types/task';
-import { taskService } from '@/services/api/projects';
-import { AppLogger } from '@/utils/logger';
+import type { TaskTableRow } from '@/services/project/task/task.types';
+import { taskService } from '@/services/project';
+import { AppLogger } from '@/core/logger/logger';
 
 interface Props {
     show: boolean;
diff --git a/frontend/src/components/project/task/TaskSelectionColumn.vue b/frontend/src/components/project/task/TaskSelectionColumn.vue
index 098f51ae..9dadcd03 100644
--- a/frontend/src/components/project/task/TaskSelectionColumn.vue
+++ b/frontend/src/components/project/task/TaskSelectionColumn.vue
@@ -33,8 +33,8 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-import type { TaskTableRow } from '@/types/task';
-import { TaskStatus } from '@/types/task';
+import type { TaskTableRow } from '@/services/project/task/task.types';
+import { TaskStatus } from '@/services/project/task/task.types';
 
 interface Props {
     /** Show header checkbox (for table header) */
diff --git a/frontend/src/components/project/task/TaskStatusBadge.vue b/frontend/src/components/project/task/TaskStatusBadge.vue
index de4c2d1d..ae8a0e57 100644
--- a/frontend/src/components/project/task/TaskStatusBadge.vue
+++ b/frontend/src/components/project/task/TaskStatusBadge.vue
@@ -9,7 +9,7 @@
 import {computed} from 'vue';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 import {faArchive, faCheckCircle, faHourglass, faPause, faPlay, faForward, faPen, faEye, faFlag, faBan, faExclamationTriangle} from '@fortawesome/free-solid-svg-icons';
-import type {TaskStatus} from '@/types/task';
+import type {TaskStatus} from '@/services/project/task/task.types';
 
 interface Props {
     status: TaskStatus;
diff --git a/frontend/src/components/project/task/TaskStatusModal.vue b/frontend/src/components/project/task/TaskStatusModal.vue
index a37fb034..b58a1955 100644
--- a/frontend/src/components/project/task/TaskStatusModal.vue
+++ b/frontend/src/components/project/task/TaskStatusModal.vue
@@ -124,8 +124,8 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import Button from '@/components/common/Button.vue';
 import TaskStatusBadge from '@/components/project/task/TaskStatusBadge.vue';
-import type {TaskTableRow} from '@/types/task';
-import {TaskStatus} from '@/types/task';
+import type {TaskTableRow} from '@/services/project/task/task.types';
+import {TaskStatus} from '@/services/project/task/task.types';
 
 interface Props {
     show: boolean;
diff --git a/frontend/src/components/project/workflow/CreateWorkflowWizard.vue b/frontend/src/components/project/workflow/CreateWorkflowWizard.vue
index 2d16d698..e96dfa4b 100644
--- a/frontend/src/components/project/workflow/CreateWorkflowWizard.vue
+++ b/frontend/src/components/project/workflow/CreateWorkflowWizard.vue
@@ -459,15 +459,15 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import type {StepperStep} from '@/components/common/Stepper.vue';
 import Stepper from '@/components/common/Stepper.vue';
-import type {CreateWorkflowWithStagesRequest, Workflow} from '@/types/workflow';
-import {WorkflowStageType} from '@/types/workflow';
-import type {ProjectMember} from '@/types/projectMember';
-import type {DataSource} from '@/types/dataSource';
-import type {LabelScheme} from '@/types/label/labelScheme';
-import {projectMemberService, dataSourceService, labelSchemeService, workflowService} from '@/services/api/projects';
-import {AppLogger} from '@/utils/logger';
+import type {CreateWorkflowWithStagesRequest, Workflow} from '@/services/project/workflow/workflow.types';
+import {WorkflowStageType} from '@/services/project/workflow/workflowStage.types';
+import type {ProjectMember} from '@/services/project/projectMember.types';
+import type {DataSource} from '@/services/project/dataSource/dataSource.types';
+import type {LabelScheme} from '@/services/project/labelScheme/label.types';
+import {projectMemberService, dataSourceService, labelSchemeService, workflowService} from '@/services/project';
+import {AppLogger} from '@/core/logger/logger';
 import {useToast} from '@/composables/useToast';
-import {filterMembersByStageType, getRoleDescriptionForStageType} from '@/core/validation/workflowRoleValidation';
+import {filterMembersByStageType, getRoleDescriptionForStageType} from '@/core/workflow';
 
 const logger = AppLogger.createComponentLogger('CreateWorkflowWizard');
 const { showApiError } = useToast();
diff --git a/frontend/src/components/project/workflow/StageAssignmentModal.vue b/frontend/src/components/project/workflow/StageAssignmentModal.vue
index 4beb90eb..53a52061 100644
--- a/frontend/src/components/project/workflow/StageAssignmentModal.vue
+++ b/frontend/src/components/project/workflow/StageAssignmentModal.vue
@@ -108,13 +108,13 @@ import {computed, onMounted, ref} from 'vue';
 import Button from '@/components/common/Button.vue';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 import {faPlus, faTrash, faTimes, faInfoCircle} from '@fortawesome/free-solid-svg-icons';
-import type {WorkflowStagePipeline, WorkflowStageAssignment} from '@/types/workflow';
-import type {ProjectMember} from '@/types/projectMember';
-import {ProjectRole} from '@/types/project';
-import {projectMemberService, workflowStageAssignmentService} from '@/services/api/projects';
+import type {WorkflowStagePipeline, WorkflowStageAssignment} from '@/services/project/workflow/workflowStage.types';
+import type {ProjectMember} from '@/services/project/projectMember.types';
+import {ProjectRole} from '@/services/project/project.types';
+import {projectMemberService, workflowStageAssignmentService} from '@/services/project';
 import {useErrorHandler} from '@/composables/useErrorHandler';
-import {AppLogger} from '@/utils/logger';
-import {filterMembersByStageType, getRoleDescriptionForStageType} from '@/core/validation/workflowRoleValidation';
+import {AppLogger} from '@/core/logger/logger';
+import {filterMembersByStageType, getRoleDescriptionForStageType} from '@/core/workflow';
 
 interface Props {
     stage: WorkflowStagePipeline;
diff --git a/frontend/src/components/project/workflow/StageEditModal.vue b/frontend/src/components/project/workflow/StageEditModal.vue
index dca5840d..e2b20a84 100644
--- a/frontend/src/components/project/workflow/StageEditModal.vue
+++ b/frontend/src/components/project/workflow/StageEditModal.vue
@@ -93,11 +93,11 @@ import {computed, onMounted, reactive, ref} from 'vue';
 import Button from '@/components/common/Button.vue';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 import {faTimes} from '@fortawesome/free-solid-svg-icons';
-import type {WorkflowStagePipeline, UpdateWorkflowStageRequest} from '@/types/workflow';
-import {formatStageType} from '@/types/workflow';
-import {workflowStageService} from '@/services/api/projects';
+import type {WorkflowStagePipeline, UpdateWorkflowStageRequest} from '@/services/project/workflow/workflowStage.types';
+import {formatStageType} from '@/services/project/workflow/workflowStage.types';
+import {workflowStageService} from '@/services/project';
 import {useErrorHandler} from '@/composables/useErrorHandler';
-import {AppLogger} from '@/utils/logger';
+import {AppLogger} from '@/core/logger/logger';
 
 interface Props {
     stage: WorkflowStagePipeline;
diff --git a/frontend/src/components/project/workflow/WorkflowCard.vue b/frontend/src/components/project/workflow/WorkflowCard.vue
index 6ef9698d..ee62befd 100644
--- a/frontend/src/components/project/workflow/WorkflowCard.vue
+++ b/frontend/src/components/project/workflow/WorkflowCard.vue
@@ -57,9 +57,10 @@
 
 <script setup lang="ts">
 import { computed } from 'vue';
-import { type Workflow, type WorkflowStage } from '@/types/workflow';
-import { type ProjectRole } from '@/types/project/project';
-import { WorkflowNavigationHelper } from '@/core/navigation';
+import { type Workflow } from '@/services/project/workflow/workflow.types';
+import { type WorkflowStage } from '@/services/project/workflow/workflowStage.types';
+import { type ProjectRole } from '@/services/project/project.types';
+import { WorkflowNavigationHelper } from '@/core/workflow';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { faDiagramProject } from '@fortawesome/free-solid-svg-icons';
 
diff --git a/frontend/src/components/project/workflow/WorkflowPipelineViewer.vue b/frontend/src/components/project/workflow/WorkflowPipelineViewer.vue
index 66644323..4976f162 100644
--- a/frontend/src/components/project/workflow/WorkflowPipelineViewer.vue
+++ b/frontend/src/components/project/workflow/WorkflowPipelineViewer.vue
@@ -77,7 +77,7 @@
 import {computed} from 'vue';
 import Button from '@/components/common/Button.vue';
 import WorkflowStageCard from './WorkflowStageCard.vue';
-import type {WorkflowStagePipeline} from '@/types/workflow';
+import type {WorkflowStagePipeline} from '@/services/project/workflow/workflowStage.types';
 
 interface Props {
     workflowId: number;
diff --git a/frontend/src/components/project/workflow/WorkflowStageCard.vue b/frontend/src/components/project/workflow/WorkflowStageCard.vue
index e4057c13..7f550dd6 100644
--- a/frontend/src/components/project/workflow/WorkflowStageCard.vue
+++ b/frontend/src/components/project/workflow/WorkflowStageCard.vue
@@ -72,8 +72,8 @@ import {
     faUsers
 } from '@fortawesome/free-solid-svg-icons';
 import Button from '@/components/common/Button.vue';
-import type {WorkflowStagePipeline} from '@/types/workflow';
-import {formatStageType, WorkflowStageType} from '@/types/workflow';
+import type {WorkflowStagePipeline} from '@/services/project/workflow/workflowStage.types';
+import {formatStageType, WorkflowStageType} from '@/services/project/workflow/workflowStage.types';
 
 interface Props {
     stage: WorkflowStagePipeline;
diff --git a/frontend/src/composables/useAssetPreview.ts b/frontend/src/composables/useAssetPreview.ts
index b299e2e0..19f7d1b8 100644
--- a/frontend/src/composables/useAssetPreview.ts
+++ b/frontend/src/composables/useAssetPreview.ts
@@ -1,13 +1,13 @@
 import { ref, computed } from 'vue';
-import type { Asset } from '@/types/asset';
-import type { Annotation } from '@/types/workspace/annotation';
-import type { TaskTableRow } from '@/types/task';
-import { assetService, annotationService } from '@/services/api/projects';
-import { AppLogger } from '@/utils/logger';
+import type { Annotation } from '@/core/workspace/annotation.types';
+import type { TaskTableRow } from '@/services/project/task/task.types';
+import { assetService, annotationService } from '@/services/project';
+import { AppLogger } from '@/core/logger/logger';
 import { 
     AnnotationTypeGuards, 
     AnnotationHelpers,
-} from '@/types/workspace/annotationHelpers';
+} from '@/core/workspace/annotationHelpers.types';
+import type { Asset } from '@/core/asset/asset.types';
 
 const logger = AppLogger.createComponentLogger('useAssetPreview');
 
diff --git a/frontend/src/composables/useAuthErrorHandler.ts b/frontend/src/composables/useAuthErrorHandler.ts
index 7262f0b1..3fcda51c 100644
--- a/frontend/src/composables/useAuthErrorHandler.ts
+++ b/frontend/src/composables/useAuthErrorHandler.ts
@@ -1,6 +1,6 @@
 import { useAuthStore } from '@/stores/authStore';
 import { useRouter } from 'vue-router';
-import { AppLogger } from '@/utils/logger';
+import { AppLogger } from '@/core/logger/logger';
 
 const logger = AppLogger.createServiceLogger('AuthErrorHandler');
 
diff --git a/frontend/src/composables/useErrorHandler.ts b/frontend/src/composables/useErrorHandler.ts
index 5cac730e..ea050b6f 100644
--- a/frontend/src/composables/useErrorHandler.ts
+++ b/frontend/src/composables/useErrorHandler.ts
@@ -1,6 +1,6 @@
 import { useToast } from '@/composables/useToast';
 import { useAlert } from '@/composables/useAlert';
-import { AppLogger } from '@/utils/logger';
+import { AppLogger } from '@/core/logger/logger';
 import {
     AppError,
     NetworkError,
@@ -8,7 +8,7 @@ import {
     ValidationError,
     ToolError,
     UserVisibleError
-} from '@/types/common/errors';
+} from '@/core/errors/errors';
 import { useAuthErrorHandler } from './useAuthErrorHandler';
 
 const logger = AppLogger.createServiceLogger('ErrorHandler');
diff --git a/frontend/src/composables/usePermissionErrorHandler.ts b/frontend/src/composables/usePermissionErrorHandler.ts
index 20d0fa1c..071fc793 100644
--- a/frontend/src/composables/usePermissionErrorHandler.ts
+++ b/frontend/src/composables/usePermissionErrorHandler.ts
@@ -1,6 +1,6 @@
 import { useToast } from '@/composables/useToast';
 import { useRouter } from 'vue-router';
-import { AppLogger } from '@/utils/logger';
+import { AppLogger } from '@/core/logger/logger';
 
 const logger = AppLogger.createServiceLogger('PermissionErrorHandler');
 
diff --git a/frontend/src/composables/useTaskSelection.ts b/frontend/src/composables/useTaskSelection.ts
index 852cc918..b70a32ec 100644
--- a/frontend/src/composables/useTaskSelection.ts
+++ b/frontend/src/composables/useTaskSelection.ts
@@ -1,7 +1,7 @@
 import { ref, computed } from 'vue';
-import type { TaskSelectionManager, SelectionState } from '@/types/task';
-import type { TaskTableRow } from '@/types/task';
-import { AppLogger } from '@/utils/logger';
+import type { TaskSelectionManager, SelectionState } from '@/services/project/task/taskSelection.types';
+import type { TaskTableRow } from '@/services/project/task/task.types';
+import { AppLogger } from '@/core/logger/logger';
 
 /**
  * Composable for managing task selection state across multiple pages
diff --git a/frontend/src/composables/useToast.ts b/frontend/src/composables/useToast.ts
index 4d03b8c6..cb322d34 100644
--- a/frontend/src/composables/useToast.ts
+++ b/frontend/src/composables/useToast.ts
@@ -1,6 +1,22 @@
-import type { Toast, ToastOptions, ToastType } from '@/types/toast';
 import { ref, readonly } from 'vue';
 
+export type ToastType = 'success' | 'error' | 'warning' | 'info';
+
+export interface Toast {
+    id: string;
+    title: string;
+    message: string;
+    type: ToastType;
+    duration?: number;
+    persistent?: boolean;
+    createdAt: number;
+}
+
+export interface ToastOptions {
+    duration?: number;
+    persistent?: boolean;
+}
+
 const toasts = ref<Toast[]>([]);
 let toastIdCounter = 0;
 
diff --git a/frontend/src/types/environment.ts b/frontend/src/config/config.types.ts
similarity index 83%
rename from frontend/src/types/environment.ts
rename to frontend/src/config/config.types.ts
index 3f840f5f..d93af19b 100644
--- a/frontend/src/types/environment.ts
+++ b/frontend/src/config/config.types.ts
@@ -1,4 +1,4 @@
-import type { LogConfig } from './logging';
+import type { LogConfig } from '@/core/logger/logger.types';
 
 export interface Environment {
     readonly API_BASE_URL: string;
diff --git a/frontend/src/config/env.ts b/frontend/src/config/env.ts
index 3107e315..aefa9c5a 100644
--- a/frontend/src/config/env.ts
+++ b/frontend/src/config/env.ts
@@ -1,5 +1,5 @@
-import type { Environment } from "@/types/environment";
-import { LogLevel, type LogConfig } from "@/types/logging";
+import type { Environment } from "./config.types";
+import { LogLevel, type LogConfig } from "@/core/logger/logger.types";
 
 function validateEnv(environment: Environment): void {
     const required = [
diff --git a/frontend/src/core/annotationWorkspace/__tests__/annotationRenderer.test.ts b/frontend/src/core/annotations/__tests__/annotationRenderer.test.ts
similarity index 100%
rename from frontend/src/core/annotationWorkspace/__tests__/annotationRenderer.test.ts
rename to frontend/src/core/annotations/__tests__/annotationRenderer.test.ts
diff --git a/frontend/src/core/annotationWorkspace/annotationDisplayUtils.ts b/frontend/src/core/annotations/annotationDisplayUtils.ts
similarity index 100%
rename from frontend/src/core/annotationWorkspace/annotationDisplayUtils.ts
rename to frontend/src/core/annotations/annotationDisplayUtils.ts
diff --git a/frontend/src/core/annotationWorkspace/annotationDrawer.ts b/frontend/src/core/annotations/annotationDrawer.ts
similarity index 98%
rename from frontend/src/core/annotationWorkspace/annotationDrawer.ts
rename to frontend/src/core/annotations/annotationDrawer.ts
index 6069c295..4e6c4f88 100644
--- a/frontend/src/core/annotationWorkspace/annotationDrawer.ts
+++ b/frontend/src/core/annotations/annotationDrawer.ts
@@ -1,4 +1,4 @@
-import type { Point } from "@/types/common/point";
+import type { Point } from "@/core/geometry/geometry.types";
 
 /**
  * Draws a point (e.g., a filled circle with a border) on the canvas.
diff --git a/frontend/src/core/annotationWorkspace/annotationManager.ts b/frontend/src/core/annotations/annotationManager.ts
similarity index 73%
rename from frontend/src/core/annotationWorkspace/annotationManager.ts
rename to frontend/src/core/annotations/annotationManager.ts
index 71caf4bf..6152f02f 100644
--- a/frontend/src/core/annotationWorkspace/annotationManager.ts
+++ b/frontend/src/core/annotations/annotationManager.ts
@@ -1,11 +1,11 @@
 import type { useWorkspaceStore } from '@/stores/workspaceStore';
-import { ToolName } from '@/types/workspace/tools';
-import type { ToolHandler } from '@/core/annotationWorkspace/toolHandlers/toolHandler';
-import { PointToolHandler } from '@/core/annotationWorkspace/toolHandlers/pointToolHandler';
-import { LineToolHandler } from '@/core/annotationWorkspace/toolHandlers/lineToolHandler';
-import { BoundingBoxToolHandler } from '@/core/annotationWorkspace/toolHandlers/boundingBoxToolHandler';
-import { PolylineToolHandler } from '@/core/annotationWorkspace/toolHandlers/polylineToolHandler';
-import { PolygonToolHandler } from '@/core/annotationWorkspace/toolHandlers/polygonToolHandler';
+import { ToolName } from '@/core/workspace/tools.types';
+import type { ToolHandler } from '@/core/workspace/interaction/toolHandlers/toolHandler';
+import { PointToolHandler } from '@/core/workspace/interaction/toolHandlers/pointToolHandler';
+import { LineToolHandler } from '@/core/workspace/interaction/toolHandlers/lineToolHandler';
+import { BoundingBoxToolHandler } from '@/core/workspace/interaction/toolHandlers/boundingBoxToolHandler';
+import { PolylineToolHandler } from '@/core/workspace/interaction/toolHandlers/polylineToolHandler';
+import { PolygonToolHandler } from '@/core/workspace/interaction/toolHandlers/polygonToolHandler';
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>;
 
diff --git a/frontend/src/core/annotationWorkspace/annotationRenderer.ts b/frontend/src/core/annotations/annotationRenderer.ts
similarity index 98%
rename from frontend/src/core/annotationWorkspace/annotationRenderer.ts
rename to frontend/src/core/annotations/annotationRenderer.ts
index b24ee46b..6da0fc76 100644
--- a/frontend/src/core/annotationWorkspace/annotationRenderer.ts
+++ b/frontend/src/core/annotations/annotationRenderer.ts
@@ -1,4 +1,4 @@
-import { AnnotationType } from "@/types/workspace/annotation";
+import { AnnotationType } from "@/core/workspace/annotation.types";
 import { drawBoundingBox, drawPoint, drawLine, drawPolyline, drawPolygon, drawEditHandle } from './annotationDrawer';
 
 export interface AnnotationRenderContext {
diff --git a/frontend/src/core/annotations/index.ts b/frontend/src/core/annotations/index.ts
new file mode 100644
index 00000000..60a77003
--- /dev/null
+++ b/frontend/src/core/annotations/index.ts
@@ -0,0 +1,13 @@
+export { getAnnotationDisplayColor, separateAnnotationsBySelection } from './annotationDisplayUtils';
+export { drawPoint, drawLine, drawPolyline, drawPolygon, drawBoundingBox, drawEditHandle } from './annotationDrawer';
+export { AnnotationManager } from './annotationManager';
+export {
+    type AnnotationRenderContext,
+    calculateRenderSizes,
+    renderPointAnnotation,
+    renderBoundingBoxAnnotation,
+    renderLineAnnotation,
+    renderPolylineAnnotation,
+    renderPolygonAnnotation,
+    renderAnnotation
+} from './annotationRenderer';
\ No newline at end of file
diff --git a/frontend/src/core/asset/__tests__/assetManager.test.ts b/frontend/src/core/asset/__tests__/assetManager.test.ts
new file mode 100644
index 00000000..f64bd471
--- /dev/null
+++ b/frontend/src/core/asset/__tests__/assetManager.test.ts
@@ -0,0 +1,475 @@
+import { describe, it, expect, beforeEach, vi, afterEach } from "vitest";
+import { AssetManager } from "../assetManager";
+import { type Asset, AssetStatus } from '@/core/asset/asset.types';
+
+// Mock the services
+vi.mock("@/services/projects", () => ({
+    assetService: {
+        getAssetById: vi.fn(),
+    },
+}));
+
+vi.mock("@/utils/logger", () => ({
+    AppLogger: {
+        createServiceLogger: vi.fn(() => ({
+            info: vi.fn(),
+            error: vi.fn(),
+            warn: vi.fn(),
+            debug: vi.fn()
+        }))
+    }
+}));
+
+import { assetService } from "@/services/project";
+
+describe("AssetManager", () => {
+    let assetManager: AssetManager;
+
+    const mockAsset: Asset = {
+        id: 1,
+        filename: "test-image.jpg",
+        imageUrl: "https://example.com/test-image.jpg",
+        width: 800,
+        height: 600,
+        mimeType: "image/jpeg",
+        sizeBytes: 1024000,
+        durationMs: 0,
+        status: AssetStatus.READY_FOR_ANNOTATION,
+        createdAt: "2024-01-01T00:00:00Z",
+        updatedAt: "2024-01-01T00:00:00Z"
+    };
+
+    beforeEach(() => {
+        assetManager = new AssetManager();
+        vi.clearAllMocks();
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+
+    describe("Constructor", () => {
+        it("should create AssetManager instance", () => {
+            expect(assetManager).toBeInstanceOf(AssetManager);
+        });
+    });
+
+    describe("loadAsset", () => {
+        it("should successfully load asset with valid parameters", async () => {
+            // Arrange
+            const projectId = "123";
+            const assetId = "456";
+            
+            vi.mocked(assetService.getAssetById).mockResolvedValue(mockAsset);
+
+            // Act
+            const result = await assetManager.loadAsset(projectId, assetId);
+
+            // Assert
+            expect(result.success).toBe(true);
+            if (result.success) {
+                expect(result.asset).toEqual(mockAsset);
+                expect(result.imageUrl).toBe(mockAsset.imageUrl);
+                expect(result.naturalDimensions).toEqual({
+                    width: mockAsset.width,
+                    height: mockAsset.height
+                });
+            }
+
+            expect(assetService.getAssetById).toHaveBeenCalledWith(123, 456);
+            expect(assetService.getAssetById).toHaveBeenCalledTimes(1);
+        });
+
+        it("should handle invalid project ID", async () => {
+            // Arrange
+            const projectId = "invalid";
+            const assetId = "456";
+
+            // Act
+            const result = await assetManager.loadAsset(projectId, assetId);
+
+            // Assert
+            expect(result.success).toBe(false);
+            if (!result.success) {
+                expect(result.error).toContain("Invalid project ID");
+            }
+
+            expect(assetService.getAssetById).not.toHaveBeenCalled();
+        });
+
+        it("should handle invalid asset ID", async () => {
+            // Arrange
+            const projectId = "123";
+            const assetId = "invalid";
+
+            // Act
+            const result = await assetManager.loadAsset(projectId, assetId);
+
+            // Assert
+            expect(result.success).toBe(false);
+            if (!result.success) {
+                expect(result.error).toContain("Invalid asset ID");
+            }
+
+            expect(assetService.getAssetById).not.toHaveBeenCalled();
+        });
+
+        it("should handle null/undefined parameters", async () => {
+            // Test null projectId
+            let result = await assetManager.loadAsset(null as any, "456");
+            expect(result.success).toBe(false);
+
+            // Test undefined assetId
+            result = await assetManager.loadAsset("123", undefined as any);
+            expect(result.success).toBe(false);
+
+            // Test empty strings
+            result = await assetManager.loadAsset("", "456");
+            expect(result.success).toBe(false);
+
+            result = await assetManager.loadAsset("123", "");
+            expect(result.success).toBe(false);
+        });
+
+        it("should handle API service errors", async () => {
+            // Arrange
+            const projectId = "123";
+            const assetId = "456";
+            const apiError = new Error("Asset not found");
+            
+            vi.mocked(assetService.getAssetById).mockRejectedValue(apiError);
+
+            // Act
+            const result = await assetManager.loadAsset(projectId, assetId);
+
+            // Assert
+            expect(result.success).toBe(false);
+            if (!result.success) {
+                expect(result.error).toBe("Asset not found");
+            }
+
+            expect(assetService.getAssetById).toHaveBeenCalledWith(123, 456);
+        });
+
+        it("should handle asset with missing image dimensions", async () => {
+            // Arrange
+            const assetWithoutDimensions = {
+                ...mockAsset,
+                width: undefined,
+                height: undefined
+            } as unknown as Asset;
+            
+            vi.mocked(assetService.getAssetById).mockResolvedValue(assetWithoutDimensions);
+
+            // Act
+            const result = await assetManager.loadAsset("123", "456");
+
+            // Assert
+            expect(result.success).toBe(true);
+            if (result.success) {
+                expect(result.naturalDimensions).toBeNull();
+            }
+        });
+
+        it("should handle asset with missing imageUrl", async () => {
+            // Arrange
+            const assetWithoutUrl = {
+                ...mockAsset,
+                imageUrl: undefined
+            } as Asset;
+            
+            vi.mocked(assetService.getAssetById).mockResolvedValue(assetWithoutUrl);
+
+            // Act
+            const result = await assetManager.loadAsset("123", "456");
+
+            // Assert
+            expect(result.success).toBe(true);
+            if (result.success) {
+                expect(result.imageUrl).toBeNull();
+            }
+        });
+    });
+
+    describe("validateAssetData", () => {
+        it("should validate correct asset data", () => {
+            // Act
+            const result = assetManager.validateAssetData(mockAsset);
+
+            // Assert
+            expect(result.isValid).toBe(true);
+            expect(result.errors).toHaveLength(0);
+        });
+
+        it("should reject asset without required fields", () => {
+            // Arrange
+            const invalidAsset = {
+                ...mockAsset,
+                id: undefined,
+                filename: undefined
+            } as any;
+
+            // Act
+            const result = assetManager.validateAssetData(invalidAsset);
+
+            // Assert
+            expect(result.isValid).toBe(false);
+            expect(result.errors.length).toBeGreaterThan(0);
+            expect(result.errors.some(error => error.includes('id'))).toBe(true);
+            expect(result.errors.some(error => error.includes('filename'))).toBe(true);
+        });
+
+        it("should reject asset with invalid dimensions", () => {
+            // Arrange
+            const invalidAsset = {
+                ...mockAsset,
+                width: -100,
+                height: 0
+            };
+
+            // Act
+            const result = assetManager.validateAssetData(invalidAsset);
+
+            // Assert
+            expect(result.isValid).toBe(false);
+            expect(result.errors.some(error => error.includes('width'))).toBe(true);
+            expect(result.errors.some(error => error.includes('height'))).toBe(true);
+        });
+
+        it("should reject asset with invalid file size", () => {
+            // Arrange
+            const invalidAsset = {
+                ...mockAsset,
+                sizeBytes: -1
+            };
+
+            // Act
+            const result = assetManager.validateAssetData(invalidAsset);
+
+            // Assert
+            expect(result.isValid).toBe(false);
+            expect(result.errors.some(error => error.includes('sizeBytes'))).toBe(true);
+        });
+
+        it("should handle null/undefined asset", () => {
+            // Test null
+            let result = assetManager.validateAssetData(null as any);
+            expect(result.isValid).toBe(false);
+            expect(result.errors.some(error => error.includes('Asset is required'))).toBe(true);
+
+            // Test undefined
+            result = assetManager.validateAssetData(undefined as any);
+            expect(result.isValid).toBe(false);
+            expect(result.errors.some(error => error.includes('Asset is required'))).toBe(true);
+        });
+    });
+
+    describe("transformAssetForWorkspace", () => {
+        it("should transform asset with all properties", () => {
+            // Act
+            const result = assetManager.transformAssetForWorkspace(mockAsset);
+
+            // Assert
+            expect(result).toEqual({
+                assetData: mockAsset,
+                imageUrl: mockAsset.imageUrl,
+                naturalDimensions: {
+                    width: mockAsset.width,
+                    height: mockAsset.height
+                }
+            });
+        });
+
+        it("should handle asset without dimensions", () => {
+            // Arrange
+            const assetWithoutDimensions = {
+                ...mockAsset,
+                width: undefined,
+                height: undefined
+            } as unknown as Asset;
+
+            // Act
+            const result = assetManager.transformAssetForWorkspace(assetWithoutDimensions);
+
+            // Assert
+            expect(result.naturalDimensions).toBeNull();
+            expect(result.assetData).toEqual(assetWithoutDimensions);
+        });
+
+        it("should handle asset without imageUrl", () => {
+            // Arrange
+            const assetWithoutUrl = {
+                ...mockAsset,
+                imageUrl: undefined
+            } as Asset;
+
+            // Act
+            const result = assetManager.transformAssetForWorkspace(assetWithoutUrl);
+
+            // Assert
+            expect(result.imageUrl).toBeNull();
+            expect(result.assetData).toEqual(assetWithoutUrl);
+        });
+
+        it("should handle asset with partial dimensions", () => {
+            // Arrange
+            const assetWithPartialDimensions = {
+                ...mockAsset,
+                width: 800,
+                height: undefined
+            } as unknown as Asset;
+
+            // Act
+            const result = assetManager.transformAssetForWorkspace(assetWithPartialDimensions);
+
+            // Assert
+            expect(result.naturalDimensions).toBeNull();
+        });
+    });
+
+    describe("getImageAspectRatio", () => {
+        it("should calculate aspect ratio for valid dimensions", () => {
+            // Act
+            const ratio = assetManager.getImageAspectRatio(mockAsset);
+
+            // Assert
+            expect(ratio).toBe(800 / 600);
+        });
+
+        it("should return null for asset without dimensions", () => {
+            // Arrange
+            const assetWithoutDimensions = {
+                ...mockAsset,
+                width: undefined,
+                height: undefined
+            } as unknown as Asset;
+
+            // Act
+            const ratio = assetManager.getImageAspectRatio(assetWithoutDimensions);
+
+            // Assert
+            expect(ratio).toBeNull();
+        });
+
+        it("should return null for zero height", () => {
+            // Arrange
+            const assetWithZeroHeight = {
+                ...mockAsset,
+                height: 0
+            };
+
+            // Act
+            const ratio = assetManager.getImageAspectRatio(assetWithZeroHeight);
+
+            // Assert
+            expect(ratio).toBeNull();
+        });
+    });
+
+    describe("canLoadAsset", () => {
+        it("should allow loading ready asset", () => {
+            // Arrange
+            const readyAsset = {
+                ...mockAsset,
+                status: AssetStatus.READY_FOR_ANNOTATION
+            };
+
+            // Act
+            const canLoad = assetManager.canLoadAsset(readyAsset);
+
+            // Assert
+            expect(canLoad).toBe(true);
+        });
+
+        it("should prevent loading processing asset", () => {
+            // Arrange
+            const processingAsset = {
+                ...mockAsset,
+                status: AssetStatus.PROCESSING
+            };
+
+            // Act
+            const canLoad = assetManager.canLoadAsset(processingAsset);
+
+            // Assert
+            expect(canLoad).toBe(false);
+        });
+
+        it("should prevent loading failed asset", () => {
+            // Arrange
+            const failedAsset = {
+                ...mockAsset,
+                status: AssetStatus.PROCESSING_ERROR
+            };
+
+            // Act
+            const canLoad = assetManager.canLoadAsset(failedAsset);
+
+            // Assert
+            expect(canLoad).toBe(false);
+        });
+    });
+
+    describe("Error Handling", () => {
+        it("should handle network errors gracefully", async () => {
+            // Arrange
+            const networkError = new Error("Network timeout");
+            vi.mocked(assetService.getAssetById).mockRejectedValue(networkError);
+
+            // Act
+            const result = await assetManager.loadAsset("123", "456");
+
+            // Assert
+            expect(result.success).toBe(false);
+            if (!result.success) {
+                expect(result.error).toBe("Network timeout");
+            }
+        });
+
+        it("should handle unexpected errors", async () => {
+            // Arrange
+            vi.mocked(assetService.getAssetById).mockRejectedValue("Unexpected error");
+
+            // Act
+            const result = await assetManager.loadAsset("123", "456");
+
+            // Assert
+            expect(result.success).toBe(false);
+            if (!result.success) {
+                expect(result.error).toContain("Failed to load asset");
+            }
+        });
+    });
+
+    describe("Performance", () => {
+        it("should handle loading multiple assets efficiently", async () => {
+            // Arrange
+            const assets = Array.from({ length: 5 }, (_, i) => ({
+                ...mockAsset,
+                id: i + 1
+            }));
+
+            vi.mocked(assetService.getAssetById)
+                .mockImplementation((_, assetId) => 
+                    Promise.resolve(assets.find(a => a.id === assetId) || mockAsset)
+                );
+
+            // Act
+            const startTime = Date.now();
+            const promises = assets.map((_, i) => 
+                assetManager.loadAsset("123", String(i + 1))
+            );
+            const results = await Promise.all(promises);
+            const endTime = Date.now();
+
+            // Assert
+            expect(results).toHaveLength(5);
+            results.forEach(result => {
+                expect(result.success).toBe(true);
+            });
+
+            // Should complete reasonably quickly (adjust threshold as needed)
+            expect(endTime - startTime).toBeLessThan(1000);
+        });
+    });
+});
\ No newline at end of file
diff --git a/frontend/src/types/asset/asset.ts b/frontend/src/core/asset/asset.types.ts
similarity index 57%
rename from frontend/src/types/asset/asset.ts
rename to frontend/src/core/asset/asset.types.ts
index 5055988b..a16d1be9 100644
--- a/frontend/src/types/asset/asset.ts
+++ b/frontend/src/core/asset/asset.types.ts
@@ -1,3 +1,8 @@
+export interface ImageDimensions {
+    width: number;
+    height: number;
+}
+
 export enum AssetStatus {
     PENDING_IMPORT = 'PENDING_IMPORT',
     IMPORTED = 'IMPORTED',
@@ -28,4 +33,34 @@ export interface Asset {
     createdAt: string;
     updatedAt: string;
     imageUrl?: string;
-}
\ No newline at end of file
+}
+
+/**
+ * Result of transforming an asset for workspace use
+ */
+export interface WorkspaceAsset {
+    assetData: Asset;
+    imageUrl: string | null;
+    naturalDimensions: ImageDimensions | null;
+}
+
+/**
+ * Result of asset loading operation
+ */
+export type AssetLoadResult = {
+    success: true;
+    asset: Asset;
+    imageUrl: string | null;
+    naturalDimensions: ImageDimensions | null;
+} | {
+    success: false;
+    error: string;
+}
+
+/**
+ * Result of validation operations
+ */
+export interface AssetValidationResult {
+    isValid: boolean;
+    errors: string[];
+}
diff --git a/frontend/src/core/asset/assetManager.ts b/frontend/src/core/asset/assetManager.ts
new file mode 100644
index 00000000..bb0a7c15
--- /dev/null
+++ b/frontend/src/core/asset/assetManager.ts
@@ -0,0 +1,261 @@
+import { assetService } from '@/services/project';
+import { AssetStatus } from './asset.types';
+import type { Asset, AssetLoadResult, AssetValidationResult, WorkspaceAsset } from './asset.types';
+import type { ImageDimensions } from '@/core/asset/asset.types';
+import { AppLogger } from '@/core/logger/logger';
+
+const logger = AppLogger.createServiceLogger('AssetManager');
+
+/**
+ * Asset Manager handles all asset-related operations for the workspace
+ * Responsible for loading, validating, and transforming assets
+ */
+export class AssetManager {
+    
+    /**
+     * Loads an asset by project and asset ID
+     * @param projectId The project ID (string)
+     * @param assetId The asset ID (string)  
+     * @returns Promise resolving to AssetLoadResult
+     */
+    async loadAsset(projectId: string, assetId: string): Promise<AssetLoadResult> {
+        try {
+            // Validate input parameters
+            const inputValidation = this._validateInputs(projectId, assetId);
+            if (!inputValidation.isValid) {
+                return {
+                    success: false,
+                    error: inputValidation.errors[0] || 'Invalid input parameters'
+                };
+            }
+
+            logger.info(`Loading asset ${assetId} for project ${projectId}`);
+
+            // Convert string IDs to numbers for API calls
+            const numericProjectId = parseInt(projectId, 10);
+            const numericAssetId = parseInt(assetId, 10);
+
+            if (isNaN(numericProjectId)) {
+                return {
+                    success: false,
+                    error: 'Invalid project ID - must be a valid number'
+                };
+            }
+
+            if (isNaN(numericAssetId)) {
+                return {
+                    success: false,
+                    error: 'Invalid asset ID - must be a valid number'
+                };
+            }
+
+            // Load asset from API
+            const assetData = await assetService.getAssetById(numericProjectId, numericAssetId);
+            
+            // Validate the loaded asset
+            const validation = this.validateAssetData(assetData);
+            if (!validation.isValid) {
+                logger.warn(`Loaded asset ${assetId} failed validation:`, validation.errors);
+                // Still return success but log warnings - we'll work with what we have
+            }
+
+            // Transform asset for workspace use
+            const workspaceAsset = this.transformAssetForWorkspace(assetData);
+
+            logger.info(`Successfully loaded asset ${assetId}`, {
+                filename: assetData.filename,
+                dimensions: workspaceAsset.naturalDimensions,
+                hasImageUrl: !!workspaceAsset.imageUrl
+            });
+
+            return {
+                success: true,
+                asset: workspaceAsset.assetData,
+                imageUrl: workspaceAsset.imageUrl,
+                naturalDimensions: workspaceAsset.naturalDimensions
+            };
+
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'Failed to load asset';
+            logger.error(`Failed to load asset ${assetId} for project ${projectId}:`, error);
+            
+            return {
+                success: false,
+                error: errorMessage
+            };
+        }
+    }
+
+    /**
+     * Validates asset data for completeness and correctness
+     * @param asset The asset to validate
+     * @returns AssetValidationResult with validation status and any errors
+     */
+    validateAssetData(asset: Asset): AssetValidationResult {
+        const errors: string[] = [];
+
+        // Check if asset exists
+        if (!asset) {
+            return {
+                isValid: false,
+                errors: ['Asset is required']
+            };
+        }
+
+        // Required fields validation
+        if (asset.id === undefined || asset.id === null) {
+            errors.push('Asset id is required');
+        }
+
+        if (!asset.filename || asset.filename.trim() === '') {
+            errors.push('Asset filename is required');
+        }
+
+        // Optional but should be valid if present
+        if (asset.width !== undefined && asset.width <= 0) {
+            errors.push('Asset width must be positive');
+        }
+
+        if (asset.height !== undefined && asset.height <= 0) {
+            errors.push('Asset height must be positive');
+        }
+
+        if (asset.sizeBytes !== undefined && asset.sizeBytes < 0) {
+            errors.push('Asset sizeBytes cannot be negative');
+        }
+
+        // MIME type validation
+        if (asset.mimeType && !this._isValidImageMimeType(asset.mimeType)) {
+            errors.push('Invalid image MIME type');
+        }
+
+        return {
+            isValid: errors.length === 0,
+            errors
+        };
+    }
+
+    /**
+     * Transforms raw asset data for workspace consumption
+     * @param asset The raw asset data
+     * @returns WorkspaceAsset with processed data
+     */
+    transformAssetForWorkspace(asset: Asset): WorkspaceAsset {
+        // Extract image URL, defaulting to null if not available
+        const imageUrl = asset.imageUrl || null;
+
+        // Create dimensions object if both width and height are available
+        let naturalDimensions: ImageDimensions | null = null;
+        if (asset.width && asset.height && asset.width > 0 && asset.height > 0) {
+            naturalDimensions = {
+                width: asset.width,
+                height: asset.height
+            };
+        }
+
+        return {
+            assetData: asset,
+            imageUrl,
+            naturalDimensions
+        };
+    }
+
+    /**
+     * Calculates the aspect ratio of an asset's image
+     * @param asset The asset to calculate aspect ratio for
+     * @returns The aspect ratio (width/height) or null if dimensions unavailable
+     */
+    getImageAspectRatio(asset: Asset): number | null {
+        if (!asset.width || !asset.height || asset.height === 0) {
+            return null;
+        }
+
+        return asset.width / asset.height;
+    }
+
+    /**
+     * Checks if an asset can be loaded in the workspace
+     * @param asset The asset to check
+     * @returns true if asset can be loaded, false otherwise
+     */
+    canLoadAsset(asset: Asset): boolean {
+        // Only allow loading assets that are ready for annotation
+        return asset.status === AssetStatus.READY_FOR_ANNOTATION;
+    }
+
+    /**
+     * Gets display information for an asset
+     * @param asset The asset to get display info for
+     * @returns Object with display-friendly information
+     */
+    getAssetDisplayInfo(asset: Asset) {
+        const aspectRatio = this.getImageAspectRatio(asset);
+        
+        return {
+            filename: asset.filename,
+            dimensions: asset.width && asset.height 
+                ? `${asset.width} × ${asset.height}` 
+                : 'Unknown dimensions',
+            aspectRatio: aspectRatio ? aspectRatio.toFixed(2) : 'N/A',
+            fileSize: asset.sizeBytes 
+                ? this._formatFileSize(asset.sizeBytes) 
+                : 'Unknown size',
+            mimeType: asset.mimeType || 'Unknown type',
+            status: asset.status || 'Unknown status'
+        };
+    }
+
+    /**
+     * Validates input parameters for asset loading
+     * @private
+     */
+    private _validateInputs(projectId: string, assetId: string): AssetValidationResult {
+        const errors: string[] = [];
+
+        if (!projectId || projectId.trim() === '') {
+            errors.push('Project ID is required');
+        }
+
+        if (!assetId || assetId.trim() === '') {
+            errors.push('Asset ID is required');
+        }
+
+        return {
+            isValid: errors.length === 0,
+            errors
+        };
+    }
+
+    /**
+     * Validates image MIME type
+     * @private
+     */
+    private _isValidImageMimeType(mimeType: string): boolean {
+        const validMimeTypes = [
+            'image/jpeg',
+            'image/jpg', 
+            'image/png',
+            'image/gif',
+            'image/webp',
+            'image/bmp',
+            'image/svg+xml',
+            'image/tiff'
+        ];
+
+        return validMimeTypes.includes(mimeType.toLowerCase());
+    }
+
+    /**
+     * Formats file size in human-readable format
+     * @private
+     */
+    private _formatFileSize(bytes: number): string {
+        if (bytes === 0) return '0 Bytes';
+
+        const k = 1024;
+        const sizes = ['Bytes', 'KB', 'MB', 'GB'];
+        const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+        return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/core/asset/index.ts b/frontend/src/core/asset/index.ts
new file mode 100644
index 00000000..3c7f9d33
--- /dev/null
+++ b/frontend/src/core/asset/index.ts
@@ -0,0 +1,2 @@
+export { AssetManager } from './assetManager';
+export type { Asset, WorkspaceAsset } from './asset.types';
\ No newline at end of file
diff --git a/frontend/src/types/common/errors.ts b/frontend/src/core/errors/errors.ts
similarity index 96%
rename from frontend/src/types/common/errors.ts
rename to frontend/src/core/errors/errors.ts
index 4b8de586..a07a602c 100644
--- a/frontend/src/types/common/errors.ts
+++ b/frontend/src/core/errors/errors.ts
@@ -1,5 +1,6 @@
 /**
- * Common error classes for the application
+ * Core application error classes and type guards
+ * Used throughout the application for consistent error handling
  */
 
 export class AppError extends Error {
diff --git a/frontend/src/core/geometry/geometry.types.ts b/frontend/src/core/geometry/geometry.types.ts
new file mode 100644
index 00000000..c896fe0c
--- /dev/null
+++ b/frontend/src/core/geometry/geometry.types.ts
@@ -0,0 +1,8 @@
+/**
+ * Basic geometric types used throughout the workspace and annotation system
+ */
+
+export interface Point {
+    x: number;
+    y: number;
+}
\ No newline at end of file
diff --git a/frontend/src/core/interceptors/__tests__/permissionEndpoints.test.ts b/frontend/src/core/interceptors/__tests__/permissionEndpoints.test.ts
new file mode 100644
index 00000000..e04d7562
--- /dev/null
+++ b/frontend/src/core/interceptors/__tests__/permissionEndpoints.test.ts
@@ -0,0 +1,68 @@
+import { describe, it, expect } from 'vitest';
+import { 
+  isPermissionChangingEndpoint, 
+  getPermissionChangeDescription,
+} from '../permissionEndpoints';
+
+describe('Permission Endpoints Detection', () => {
+  describe('isPermissionChangingEndpoint', () => {
+    it('should detect project creation endpoint', () => {
+      expect(isPermissionChangingEndpoint('/projects', 'POST')).toBe(true);
+      expect(isPermissionChangingEndpoint('/projects', 'GET')).toBe(false);
+    });
+
+    it('should detect invitation acceptance endpoints', () => {
+      expect(isPermissionChangingEndpoint('/invitations/accept/abc123', 'POST')).toBe(true);
+      expect(isPermissionChangingEndpoint('/invitations/accept/xyz789', 'POST')).toBe(true);
+      expect(isPermissionChangingEndpoint('/invitations/accept/abc123', 'GET')).toBe(false);
+    });
+
+    it('should detect project member management endpoints', () => {
+      expect(isPermissionChangingEndpoint('/projects/123/projectmembers/456', 'PUT')).toBe(true);
+      expect(isPermissionChangingEndpoint('/projects/123/projectmembers/456', 'PATCH')).toBe(true);
+      expect(isPermissionChangingEndpoint('/projects/123/projectmembers/456', 'DELETE')).toBe(true);
+      expect(isPermissionChangingEndpoint('/projects/123/projectmembers', 'POST')).toBe(true);
+      expect(isPermissionChangingEndpoint('/projects/123/projectmembers', 'GET')).toBe(false);
+    });
+
+    it('should handle URL normalization', () => {
+      expect(isPermissionChangingEndpoint('projects', 'POST')).toBe(true);
+      expect(isPermissionChangingEndpoint('/projects?param=value', 'POST')).toBe(true);
+    });
+
+    it('should return false for non-permission endpoints', () => {
+      expect(isPermissionChangingEndpoint('/assets/123', 'GET')).toBe(false);
+      expect(isPermissionChangingEndpoint('/workflows', 'GET')).toBe(false);
+      expect(isPermissionChangingEndpoint('/unknown/endpoint', 'POST')).toBe(false);
+    });
+
+    it('should handle invalid inputs', () => {
+      expect(isPermissionChangingEndpoint(undefined, 'POST')).toBe(false);
+      expect(isPermissionChangingEndpoint('/projects', '')).toBe(false);
+      expect(isPermissionChangingEndpoint('', 'POST')).toBe(false);
+    });
+  });
+
+  describe('getPermissionChangeDescription', () => {
+    it('should return correct descriptions for permission-changing endpoints', () => {
+      expect(getPermissionChangeDescription('/projects', 'POST'))
+        .toBe('Project creation - user becomes manager');
+      
+      expect(getPermissionChangeDescription('/invitations/accept/abc123', 'POST'))
+        .toBe('Invitation acceptance - user joins project');
+      
+      expect(getPermissionChangeDescription('/projects/123/projectmembers/456', 'PUT'))
+        .toBe('Project member role updates');
+    });
+
+    it('should return null for non-permission endpoints', () => {
+      expect(getPermissionChangeDescription('/assets/123', 'GET')).toBe(null);
+      expect(getPermissionChangeDescription('/projects', 'GET')).toBe(null);
+    });
+
+    it('should handle invalid inputs', () => {
+      expect(getPermissionChangeDescription(undefined, 'POST')).toBe(null);
+      expect(getPermissionChangeDescription('/projects', '')).toBe(null);
+    });
+  });
+});
\ No newline at end of file
diff --git a/frontend/src/core/interceptors/index.ts b/frontend/src/core/interceptors/index.ts
new file mode 100644
index 00000000..1901da84
--- /dev/null
+++ b/frontend/src/core/interceptors/index.ts
@@ -0,0 +1 @@
+export { isPermissionChangingEndpoint, getPermissionChangeDescription } from './permissionEndpoints';
\ No newline at end of file
diff --git a/frontend/src/core/interceptors/permissionEndpoints.ts b/frontend/src/core/interceptors/permissionEndpoints.ts
new file mode 100644
index 00000000..70003752
--- /dev/null
+++ b/frontend/src/core/interceptors/permissionEndpoints.ts
@@ -0,0 +1,145 @@
+/**
+ * Utility functions to identify API endpoints that modify user permissions.
+ * When these endpoints return successfully, permissions should be automatically refreshed.
+ */
+
+/**
+ * List of API endpoints that change user permissions when called successfully.
+ * These patterns support wildcards (*) and parameter matching.
+ */
+const PERMISSION_CHANGING_ENDPOINTS: Array<{
+    pattern: string;
+    methods: string[];
+    description: string;
+}> = [
+    // Project creation - user becomes project manager
+    {
+        pattern: "/projects",
+        methods: ["POST"],
+        description: "Project creation - user becomes manager",
+    },
+
+    // Project invitation acceptance - user joins project
+    {
+        pattern: "/invitations/accept/*",
+        methods: ["POST"],
+        description: "Invitation acceptance - user joins project",
+    },
+
+    // Project member role changes
+    {
+        pattern: "/projects/*/projectmembers/*",
+        methods: ["PUT", "PATCH"],
+        description: "Project member role updates",
+    },
+
+    // Project member removal (if removing self)
+    {
+        pattern: "/projects/*/projectmembers/*",
+        methods: ["DELETE"],
+        description: "Project member removal",
+    },
+
+    // Project member additions (invitations)
+    {
+        pattern: "/projects/*/projectmembers",
+        methods: ["POST"],
+        description: "Project member addition via invitation",
+    },
+
+    // User role changes (global permissions)
+    {
+        pattern: "/users/*/role",
+        methods: ["PUT", "PATCH"],
+        description: "User global role changes",
+    },
+
+    // Account role promotions/demotions
+    {
+        pattern: "/account/role",
+        methods: ["PUT", "PATCH"],
+        description: "Account role changes",
+    },
+];
+
+/**
+ * Converts a pattern with wildcards to a regular expression.
+ * Supports * for matching any path segment.
+ *
+ * @param pattern - URL pattern with wildcards (e.g., "/projects/*\/members")
+ * @returns RegExp object for matching URLs
+ */
+function patternToRegex(pattern: string): RegExp {
+    // First replace * with a placeholder to avoid escaping them
+    const withPlaceholders = pattern.replace(/\*/g, '__WILDCARD__');
+    // Escape special regex characters
+    const escaped = withPlaceholders.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
+    // Replace placeholders with regex pattern for path segments
+    const regexPattern = escaped.replace(/__WILDCARD__/g, "[^/]+");
+    // Ensure we match the full path (anchored)
+    return new RegExp(`^${regexPattern}$`);
+}
+
+/**
+ * Checks if a given URL and HTTP method combination represents
+ * an endpoint that changes user permissions.
+ *
+ * @param url - The API endpoint URL (e.g., "/projects/123/members")
+ * @param method - The HTTP method (e.g., "POST", "PUT", "DELETE")
+ * @returns true if this endpoint changes permissions when successful
+ */
+export function isPermissionChangingEndpoint(
+    url: string | undefined,
+    method: string
+): boolean {
+    if (!url || !method) {
+        return false;
+    }
+
+    // Normalize the URL by removing query parameters and ensuring it starts with /
+    const cleanUrl = url.split("?")[0];
+    const normalizedUrl = cleanUrl.startsWith("/") ? cleanUrl : `/${cleanUrl}`;
+    const upperMethod = method.toUpperCase();
+
+    return PERMISSION_CHANGING_ENDPOINTS.some((endpoint) => {
+        // Check if method matches
+        if (!endpoint.methods.includes(upperMethod)) {
+            return false;
+        }
+
+        // Check if URL matches pattern
+        const regex = patternToRegex(endpoint.pattern);
+        return regex.test(normalizedUrl);
+    });
+}
+
+/**
+ * Gets a human-readable description of what permission change
+ * an endpoint represents, for logging purposes.
+ *
+ * @param url - The API endpoint URL
+ * @param method - The HTTP method
+ * @returns Description string or null if not a permission-changing endpoint
+ */
+export function getPermissionChangeDescription(
+    url: string | undefined,
+    method: string
+): string | null {
+    if (!url || !method) {
+        return null;
+    }
+
+    const cleanUrl = url.split("?")[0];
+    const normalizedUrl = cleanUrl.startsWith("/") ? cleanUrl : `/${cleanUrl}`;
+    const upperMethod = method.toUpperCase();
+
+    const matchingEndpoint = PERMISSION_CHANGING_ENDPOINTS.find((endpoint) => {
+        if (!endpoint.methods.includes(upperMethod)) {
+            return false;
+        }
+        const regex = patternToRegex(endpoint.pattern);
+        return regex.test(normalizedUrl);
+    });
+
+    return matchingEndpoint?.description || null;
+}
\ No newline at end of file
diff --git a/frontend/src/utils/__tests__/logger.basic.test.ts b/frontend/src/core/logger/__tests__/logger.basic.test.ts
similarity index 99%
rename from frontend/src/utils/__tests__/logger.basic.test.ts
rename to frontend/src/core/logger/__tests__/logger.basic.test.ts
index e53ef21c..f2501636 100644
--- a/frontend/src/utils/__tests__/logger.basic.test.ts
+++ b/frontend/src/core/logger/__tests__/logger.basic.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { LogLevel } from '@/types/logging';
+import { LogLevel } from '../logger.types';
 
 // Mock env with basic configuration
 vi.mock('@/config/env', () => ({
diff --git a/frontend/src/utils/__tests__/logger.plugins.test.ts b/frontend/src/core/logger/__tests__/logger.plugins.test.ts
similarity index 99%
rename from frontend/src/utils/__tests__/logger.plugins.test.ts
rename to frontend/src/core/logger/__tests__/logger.plugins.test.ts
index 5a2d43a8..49b97d3a 100644
--- a/frontend/src/utils/__tests__/logger.plugins.test.ts
+++ b/frontend/src/core/logger/__tests__/logger.plugins.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
 import { createApp } from 'vue';
 import { createPinia, setActivePinia } from 'pinia';
-import { LogLevel } from '@/types/logging';
+import { LogLevel } from '../logger.types';
 
 // Mock env with basic configuration
 vi.mock('@/config/env', () => ({
diff --git a/frontend/src/utils/logger.ts b/frontend/src/core/logger/logger.ts
similarity index 76%
rename from frontend/src/utils/logger.ts
rename to frontend/src/core/logger/logger.ts
index a0276578..0e4a3bf8 100644
--- a/frontend/src/utils/logger.ts
+++ b/frontend/src/core/logger/logger.ts
@@ -1,7 +1,8 @@
 import type { App } from 'vue'
 import 'pinia'
-import { LogLevel } from '@/types/logging'
+import { LogLevel } from './logger.types'
 import { env } from '@/config/env'
+import type { ContextLogger } from './logger.types'
 
 /**
  * Centralized logging utility with context-aware loggers for different application layers.
@@ -97,7 +98,7 @@ class Logger {
     }
 
     // Context-specific logger creators
-    createComponentLogger(componentName: string) {
+    createComponentLogger(componentName: string): ContextLogger {
         return {
             debug: (message: string, obj?: any) => this.debug(message, obj, componentName, 'component'),
             info: (message: string, obj?: any) => this.info(message, obj, componentName, 'component'),
@@ -106,7 +107,7 @@ class Logger {
         };
     }
 
-    createServiceLogger(serviceName: string) {
+    createServiceLogger(serviceName: string): ContextLogger {
         return {
             debug: (message: string, obj?: any) => this.debug(message, obj, serviceName, 'service'),
             info: (message: string, obj?: any) => this.info(message, obj, serviceName, 'service'),
@@ -115,7 +116,7 @@ class Logger {
         };
     }
 
-    createStoreLogger(storeName: string) {
+    createStoreLogger(storeName: string): ContextLogger {
         return {
             debug: (message: string, obj?: any) => this.debug(message, obj, storeName, 'store'),
             info: (message: string, obj?: any) => this.info(message, obj, storeName, 'store'),
@@ -157,48 +158,4 @@ export const piniaLogger = function () {
         $logError: (message: string, obj?: any) => AppLogger.error(message, obj),
         $createStoreLogger: (storeName: string) => AppLogger.createStoreLogger(storeName)
     }
-}
-
-// Type declarations for Vue components
-declare module '@vue/runtime-core' {
-    interface ComponentCustomProperties {
-        $logDebug: (message: string, obj?: any) => void
-        $logInfo: (message: string, obj?: any) => void
-        $logWarn: (message: string, obj?: any) => void
-        $logError: (message: string, obj?: any) => void
-        $createComponentLogger: (componentName: string) => {
-            debug: (message: string, obj?: any) => void
-            info: (message: string, obj?: any) => void
-            warn: (message: string, obj?: any) => void
-            error: (message: string, obj?: any) => void
-        }
-        $createServiceLogger: (serviceName: string) => {
-            debug: (message: string, obj?: any) => void
-            info: (message: string, obj?: any) => void
-            warn: (message: string, obj?: any) => void
-            error: (message: string, obj?: any) => void
-        }
-        $createStoreLogger: (storeName: string) => {
-            debug: (message: string, obj?: any) => void
-            info: (message: string, obj?: any) => void
-            warn: (message: string, obj?: any) => void
-            error: (message: string, obj?: any) => void
-        }
-    }
-}
-
-// Type declarations for Pinia stores
-declare module 'pinia' {
-    export interface PiniaCustomProperties {
-        $logDebug: (message: string, obj?: any) => void
-        $logInfo: (message: string, obj?: any) => void
-        $logWarn: (message: string, obj?: any) => void
-        $logError: (message: string, obj?: any) => void
-        $createStoreLogger: (storeName: string) => {
-            debug: (message: string, obj?: any) => void
-            info: (message: string, obj?: any) => void
-            warn: (message: string, obj?: any) => void
-            error: (message: string, obj?: any) => void
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/core/logger/logger.types.ts b/frontend/src/core/logger/logger.types.ts
new file mode 100644
index 00000000..ce217029
--- /dev/null
+++ b/frontend/src/core/logger/logger.types.ts
@@ -0,0 +1,27 @@
+/**
+ * Logger types and configuration interfaces
+ */
+
+export enum LogLevel {
+    DEBUG = 'debug',
+    INFO = 'info',
+    WARN = 'warn',
+    ERROR = 'error'
+}
+
+export interface LogConfig {
+    readonly level: LogLevel;
+    readonly enableInProduction: boolean;
+    readonly enableTimestamps: boolean;
+    readonly enableServicePrefix: boolean;
+}
+
+/**
+ * Context logger interface for components, services, and stores
+ */
+export interface ContextLogger {
+    debug: (message: string, obj?: any) => void;
+    info: (message: string, obj?: any) => void;
+    warn: (message: string, obj?: any) => void;
+    error: (message: string, obj?: any) => void;
+}
diff --git a/frontend/src/core/navigation/index.ts b/frontend/src/core/navigation/index.ts
deleted file mode 100644
index 32f157fd..00000000
--- a/frontend/src/core/navigation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './workflowNavigation';
\ No newline at end of file
diff --git a/frontend/src/core/storage/index.ts b/frontend/src/core/persistence/index.ts
similarity index 100%
rename from frontend/src/core/storage/index.ts
rename to frontend/src/core/persistence/index.ts
diff --git a/frontend/src/core/storage/lastProject.ts b/frontend/src/core/persistence/lastProject.ts
similarity index 96%
rename from frontend/src/core/storage/lastProject.ts
rename to frontend/src/core/persistence/lastProject.ts
index bc2661a5..f9eb0cd0 100644
--- a/frontend/src/core/storage/lastProject.ts
+++ b/frontend/src/core/persistence/lastProject.ts
@@ -1,5 +1,5 @@
-import { AppLogger } from '@/utils/logger';
-import type { LastProjectData } from '@/types/storage/lastProject';
+import { AppLogger } from '@/core/logger/logger';
+import type { LastProjectData } from '@/core/persistence/lastProject.types';
 
 const LAST_PROJECT_STORAGE_KEY_PREFIX = 'laberis_last_project_';
 const logger = AppLogger.createServiceLogger('LastProjectUtil');
diff --git a/frontend/src/core/persistence/lastProject.types.ts b/frontend/src/core/persistence/lastProject.types.ts
new file mode 100644
index 00000000..d3bca713
--- /dev/null
+++ b/frontend/src/core/persistence/lastProject.types.ts
@@ -0,0 +1,14 @@
+export interface LastProjectData {
+    projectId: number;
+    projectName: string;
+    lastAccessedAt: number;
+}
+
+export interface LastStageData {
+    projectId: number;
+    workflowId: number;
+    stageId: number;
+    stageName: string;
+    projectName: string;
+    lastAccessedAt: number;
+}
\ No newline at end of file
diff --git a/frontend/src/core/storage/lastStage.ts b/frontend/src/core/persistence/lastStage.ts
similarity index 96%
rename from frontend/src/core/storage/lastStage.ts
rename to frontend/src/core/persistence/lastStage.ts
index dba69148..832be400 100644
--- a/frontend/src/core/storage/lastStage.ts
+++ b/frontend/src/core/persistence/lastStage.ts
@@ -1,5 +1,5 @@
-import { AppLogger } from '@/utils/logger';
-import type { LastStageData } from '@/types/storage/lastStage';
+import { AppLogger } from '@/core/logger/logger';
+import type { LastStageData } from '@/core/persistence/lastStage.types';
 
 const LAST_STAGE_STORAGE_KEY = 'laberis_last_stage';
 const logger = AppLogger.createServiceLogger('LastStageUtil');
diff --git a/frontend/src/types/storage/lastStage.ts b/frontend/src/core/persistence/lastStage.types.ts
similarity index 69%
rename from frontend/src/types/storage/lastStage.ts
rename to frontend/src/core/persistence/lastStage.types.ts
index b91eedef..78cda896 100644
--- a/frontend/src/types/storage/lastStage.ts
+++ b/frontend/src/core/persistence/lastStage.types.ts
@@ -1,3 +1,6 @@
+/**
+ * Data structure for storing the user's last accessed workflow stage
+ */
 export interface LastStageData {
     projectId: number;
     workflowId: number;
diff --git a/frontend/src/core/table/table.types.ts b/frontend/src/core/table/table.types.ts
new file mode 100644
index 00000000..1466ccf4
--- /dev/null
+++ b/frontend/src/core/table/table.types.ts
@@ -0,0 +1,35 @@
+export interface TableColumn {
+    key: string;
+    label: string;
+    sortable?: boolean;
+    align?: 'left' | 'center' | 'right';
+    format?: 'date' | 'datetime' | 'number' | 'currency';
+    component?: any;
+    headerClass?: string;
+    cellClass?: string;
+    width?: string;
+}
+
+export interface TableAction {
+    key: string;
+    label: string;
+    icon?: any;
+    variant?: 'primary' | 'secondary' | 'danger';
+    disabled?: boolean;
+}
+
+export interface TableRowAction<T = any> {
+    key: string;
+    label?: string;
+    icon?: any;
+    variant?: 'primary' | 'secondary' | 'danger';
+    disabled?: (row: T) => boolean;
+    tooltip?: (row: T) => string;
+}
+
+export interface TablePagination {
+    currentPage: number;
+    pageSize: number;
+    totalPages: number;
+    totalItems: number;
+}
\ No newline at end of file
diff --git a/frontend/src/utils/colors.ts b/frontend/src/core/theming/colors.ts
similarity index 99%
rename from frontend/src/utils/colors.ts
rename to frontend/src/core/theming/colors.ts
index 25f7e778..29225d3f 100644
--- a/frontend/src/utils/colors.ts
+++ b/frontend/src/core/theming/colors.ts
@@ -92,4 +92,4 @@ export function getNextAvailableColor(usedColors: string[]): string {
     
     // If all colors are used, return a random one
     return generateRandomColor();
-}
+}
\ No newline at end of file
diff --git a/frontend/src/core/theming/index.ts b/frontend/src/core/theming/index.ts
new file mode 100644
index 00000000..fe154cfe
--- /dev/null
+++ b/frontend/src/core/theming/index.ts
@@ -0,0 +1,7 @@
+export { 
+    generateRandomColor, 
+    getContrastingTextColor, 
+    isValidHexColor, 
+    hexToRgba, 
+    getNextAvailableColor 
+} from './colors';
\ No newline at end of file
diff --git a/frontend/src/core/timing/index.ts b/frontend/src/core/timing/index.ts
new file mode 100644
index 00000000..d4ddf9e5
--- /dev/null
+++ b/frontend/src/core/timing/index.ts
@@ -0,0 +1,2 @@
+export { Timer } from './timer';
+export type { TimerService } from './timer.types';
\ No newline at end of file
diff --git a/frontend/src/utils/timer.ts b/frontend/src/core/timing/timer.ts
similarity index 99%
rename from frontend/src/utils/timer.ts
rename to frontend/src/core/timing/timer.ts
index 87094f0d..6901d7a1 100644
--- a/frontend/src/utils/timer.ts
+++ b/frontend/src/core/timing/timer.ts
@@ -134,4 +134,4 @@ export class Timer {
 
         return `${hh}:${mm}:${ss}${includeMilliseconds ? `.${ms}` : ""}`;
     }
-}
+}
\ No newline at end of file
diff --git a/frontend/src/core/timing/timer.types.ts b/frontend/src/core/timing/timer.types.ts
new file mode 100644
index 00000000..d452eda6
--- /dev/null
+++ b/frontend/src/core/timing/timer.types.ts
@@ -0,0 +1,12 @@
+/**
+ * Interface for timer service functionality
+ */
+export interface TimerService {
+    isRunning(): boolean;
+    getElapsedTime(): number;
+    start(): void;
+    stop(): void;
+    pause(): void;
+    resume(): void;
+    reset(): void;
+}
\ No newline at end of file
diff --git a/frontend/src/core/workflow/index.ts b/frontend/src/core/workflow/index.ts
new file mode 100644
index 00000000..8fb9f0f7
--- /dev/null
+++ b/frontend/src/core/workflow/index.ts
@@ -0,0 +1,9 @@
+export { WorkflowNavigationHelper } from './navigation';
+export {
+    ROLE_STAGE_MAPPING,
+    canRoleBeAssignedToStageType,
+    getAllowedRolesForStageType,
+    getAllowedStageTypesForRole,
+    filterMembersByStageType,
+    getRoleDescriptionForStageType
+} from './roleValidation';
\ No newline at end of file
diff --git a/frontend/src/core/navigation/workflowNavigation.ts b/frontend/src/core/workflow/navigation.ts
similarity index 86%
rename from frontend/src/core/navigation/workflowNavigation.ts
rename to frontend/src/core/workflow/navigation.ts
index 92300049..eb00f6f4 100644
--- a/frontend/src/core/navigation/workflowNavigation.ts
+++ b/frontend/src/core/workflow/navigation.ts
@@ -1,11 +1,12 @@
-import { AppLogger } from '@/utils/logger';
-import { ProjectRole } from '@/types/project/project';
-import { WorkflowStageType } from '@/types/workflow/workflowstage';
-import type { WorkflowStage, Workflow } from '@/types/workflow';
+import { AppLogger } from '@/core/logger/logger';
+import { ProjectRole } from '@/services/project/project.types';
+import { WorkflowStageType } from '@/services/project/workflow/workflowStage.types';
+import type { WorkflowStage } from '@/services/project/workflow/workflowStage.types';
+import type { Workflow } from '@/services/project/workflow/workflow.types';
 import { faEdit, faCheckCircle, faTasks, faEye, faDiagramProject } from '@fortawesome/free-solid-svg-icons';
 import type { IconDefinition } from '@fortawesome/fontawesome-svg-core';
 
-const logger = AppLogger.createServiceLogger('WorkflowNavigationUtil');
+const logger = AppLogger.createServiceLogger('WorkflowNavigation');
 
 /**
  * Role-based workflow navigation utility
@@ -163,19 +164,4 @@ export class WorkflowNavigationHelper {
             accessibleStagesCount: accessibleStages.length
         };
     }
-
-    // TODO: Implement workflow edit functionality
-    // static editWorkflow(workflowId: number): void {
-    //     // Implementation needed for editing workflow details, stages, and configurations
-    // }
-
-    // TODO: Implement workflow deletion functionality  
-    // static deleteWorkflow(workflowId: number): Promise<void> {
-    //     // Implementation needed for safe workflow deletion with validation checks
-    // }
-
-    // TODO: Implement workflow update functionality
-    // static updateWorkflow(workflowId: number, updates: Partial<Workflow>): Promise<void> {
-    //     // Implementation needed for updating workflow properties and stage configurations
-    // }
 }
\ No newline at end of file
diff --git a/frontend/src/core/validation/workflowRoleValidation.ts b/frontend/src/core/workflow/roleValidation.ts
similarity index 94%
rename from frontend/src/core/validation/workflowRoleValidation.ts
rename to frontend/src/core/workflow/roleValidation.ts
index 63c492db..f259c250 100644
--- a/frontend/src/core/validation/workflowRoleValidation.ts
+++ b/frontend/src/core/workflow/roleValidation.ts
@@ -1,5 +1,5 @@
-import { ProjectRole } from '@/types/project';
-import { WorkflowStageType } from '@/types/workflow';
+import { ProjectRole } from '@/services/project/project.types';
+import { WorkflowStageType } from '@/services/project/workflow/workflowStage.types';
 
 /**
  * Defines which project roles are allowed to be assigned to which workflow stage types
diff --git a/frontend/src/types/workspace/annotation.ts b/frontend/src/core/workspace/annotation.types.ts
similarity index 97%
rename from frontend/src/types/workspace/annotation.ts
rename to frontend/src/core/workspace/annotation.types.ts
index f0adf70d..3c0a946b 100644
--- a/frontend/src/types/workspace/annotation.ts
+++ b/frontend/src/core/workspace/annotation.types.ts
@@ -1,4 +1,4 @@
-import type { Point } from "@/types/common/point";
+import type { Point } from "@/core/geometry/geometry.types";
 
 // --- Annotation Type Enum ---
 export enum AnnotationType {
diff --git a/frontend/src/types/workspace/annotationHelpers.ts b/frontend/src/core/workspace/annotationHelpers.types.ts
similarity index 97%
rename from frontend/src/types/workspace/annotationHelpers.ts
rename to frontend/src/core/workspace/annotationHelpers.types.ts
index 1218b3e9..018b3300 100644
--- a/frontend/src/types/workspace/annotationHelpers.ts
+++ b/frontend/src/core/workspace/annotationHelpers.types.ts
@@ -1,5 +1,5 @@
-import type { Annotation, BoundingBoxAnnotationData, PointAnnotationData, PolygonAnnotationData, PolylineAnnotationData, LineAnnotationData } from './annotation';
-import { AnnotationType } from './annotation';
+import type { Annotation, BoundingBoxAnnotationData, PointAnnotationData, PolygonAnnotationData, PolylineAnnotationData, LineAnnotationData } from './annotation.types';
+import { AnnotationType } from './annotation.types';
 
 /**
  * Proper typed annotation interfaces that match actual annotation coordinate structures
@@ -128,4 +128,4 @@ export const AnnotationHelpers = {
         if (!originalSize || originalSize === 0) return coordinate;
         return (coordinate / originalSize) * targetSize;
     }
-} as const;
+} as const;
\ No newline at end of file
diff --git a/frontend/src/core/annotationWorkspace/__tests__/geometry.test.ts b/frontend/src/core/workspace/geometry/__tests__/geometry.test.ts
similarity index 100%
rename from frontend/src/core/annotationWorkspace/__tests__/geometry.test.ts
rename to frontend/src/core/workspace/geometry/__tests__/geometry.test.ts
diff --git a/frontend/src/core/annotationWorkspace/coordinateTransforms.ts b/frontend/src/core/workspace/geometry/coordinateTransforms.ts
similarity index 94%
rename from frontend/src/core/annotationWorkspace/coordinateTransforms.ts
rename to frontend/src/core/workspace/geometry/coordinateTransforms.ts
index fb548c15..0c7b58d4 100644
--- a/frontend/src/core/annotationWorkspace/coordinateTransforms.ts
+++ b/frontend/src/core/workspace/geometry/coordinateTransforms.ts
@@ -1,6 +1,6 @@
-import type { Point } from "@/types/common/point";
-import { AnnotationType } from "@/types/workspace/annotation";
-import { clampPointToImageBounds } from '@/core/annotationWorkspace/geometry';
+import type { Point } from "@/core/geometry/geometry.types";
+import { AnnotationType } from "@/core/workspace/annotation.types";
+import { clampPointToImageBounds } from './geometry';
 
 /**
  * Update annotation point coordinates locally (without backend save)
diff --git a/frontend/src/core/annotationWorkspace/geometry.ts b/frontend/src/core/workspace/geometry/geometry.ts
similarity index 98%
rename from frontend/src/core/annotationWorkspace/geometry.ts
rename to frontend/src/core/workspace/geometry/geometry.ts
index f37cca31..7b80d934 100644
--- a/frontend/src/core/annotationWorkspace/geometry.ts
+++ b/frontend/src/core/workspace/geometry/geometry.ts
@@ -1,4 +1,4 @@
-import type { Point } from "@/types/common/point";
+import type { Point } from "@/core/geometry/geometry.types";
 
 /**
  * Check if a point is near another point (for handle detection)
diff --git a/frontend/src/core/annotationWorkspace/hitDetection.ts b/frontend/src/core/workspace/geometry/hitDetection.ts
similarity index 97%
rename from frontend/src/core/annotationWorkspace/hitDetection.ts
rename to frontend/src/core/workspace/geometry/hitDetection.ts
index b9ec9859..5e0759b1 100644
--- a/frontend/src/core/annotationWorkspace/hitDetection.ts
+++ b/frontend/src/core/workspace/geometry/hitDetection.ts
@@ -1,5 +1,5 @@
-import type { Point } from "@/types/common/point";
-import { AnnotationType } from "@/types/workspace/annotation";
+import type { Point } from "@/core/geometry/geometry.types";
+import { AnnotationType } from "@/core/workspace/annotation.types";
 import {
     isPointNearHandle,
     isPointNearLine,
diff --git a/frontend/src/core/workspace/geometry/index.ts b/frontend/src/core/workspace/geometry/index.ts
new file mode 100644
index 00000000..63b80f14
--- /dev/null
+++ b/frontend/src/core/workspace/geometry/index.ts
@@ -0,0 +1,21 @@
+export { updateAnnotationPointLocally } from './coordinateTransforms';
+export {
+    isPointNearHandle,
+    isPointNearLine,
+    isPointInBoundingBox,
+    isPointNearPolyline,
+    isPointInPolygon,
+    clampPointToImageBounds,
+    isPointInImageBounds
+} from './geometry';
+export { type AnnotationHitResult, checkAnnotationHit, findAnnotationAtPoint } from './hitDetection';
+export {
+    type CanvasDisplaySettings,
+    type ImageDimensions,
+    type ViewState,
+    calculateCanvasDimensions,
+    calculateCenterAndFitView,
+    mouseToImageCoordinates,
+    calculateZoomFromWheel,
+    calculateZoomViewOffset
+} from './viewport';
\ No newline at end of file
diff --git a/frontend/src/core/annotationWorkspace/viewport.ts b/frontend/src/core/workspace/geometry/viewport.ts
similarity index 98%
rename from frontend/src/core/annotationWorkspace/viewport.ts
rename to frontend/src/core/workspace/geometry/viewport.ts
index 85c541c7..4328e579 100644
--- a/frontend/src/core/annotationWorkspace/viewport.ts
+++ b/frontend/src/core/workspace/geometry/viewport.ts
@@ -1,4 +1,4 @@
-import type { Point } from "@/types/common/point";
+import type { Point } from "@/core/geometry/geometry.types";
 
 export interface CanvasDisplaySettings {
     width: number;
diff --git a/frontend/src/core/workspace/index.ts b/frontend/src/core/workspace/index.ts
new file mode 100644
index 00000000..0fcdaf9c
--- /dev/null
+++ b/frontend/src/core/workspace/index.ts
@@ -0,0 +1,6 @@
+// Annotations
+export * from '../annotations';
+export * from '../asset';
+export * from './geometry';
+export * from './interaction';
+export * from './task';
\ No newline at end of file
diff --git a/frontend/src/core/annotationWorkspace/cursors.ts b/frontend/src/core/workspace/interaction/cursors.ts
similarity index 93%
rename from frontend/src/core/annotationWorkspace/cursors.ts
rename to frontend/src/core/workspace/interaction/cursors.ts
index 35e3d996..ed56def6 100644
--- a/frontend/src/core/annotationWorkspace/cursors.ts
+++ b/frontend/src/core/workspace/interaction/cursors.ts
@@ -1,4 +1,4 @@
-import { ToolName } from "@/types/workspace/tools";
+import { ToolName } from "@/core/workspace/tools.types";
 
 /**
  * Calculate the appropriate cursor style based on current tool and interaction state
diff --git a/frontend/src/core/workspace/interaction/index.ts b/frontend/src/core/workspace/interaction/index.ts
new file mode 100644
index 00000000..cfc595c2
--- /dev/null
+++ b/frontend/src/core/workspace/interaction/index.ts
@@ -0,0 +1,7 @@
+export { calculateCanvasCursorStyle } from './cursors';
+export { type ToolHandler } from './toolHandlers/toolHandler';
+export { BoundingBoxToolHandler } from './toolHandlers/boundingBoxToolHandler';
+export { LineToolHandler } from './toolHandlers/lineToolHandler';
+export { PointToolHandler } from './toolHandlers/pointToolHandler';
+export { PolygonToolHandler } from './toolHandlers/polygonToolHandler';
+export { PolylineToolHandler } from './toolHandlers/polylineToolHandler';
\ No newline at end of file
diff --git a/frontend/src/core/annotationWorkspace/toolHandlers/boundingBoxToolHandler.ts b/frontend/src/core/workspace/interaction/toolHandlers/boundingBoxToolHandler.ts
similarity index 90%
rename from frontend/src/core/annotationWorkspace/toolHandlers/boundingBoxToolHandler.ts
rename to frontend/src/core/workspace/interaction/toolHandlers/boundingBoxToolHandler.ts
index ac84a032..d670833d 100644
--- a/frontend/src/core/annotationWorkspace/toolHandlers/boundingBoxToolHandler.ts
+++ b/frontend/src/core/workspace/interaction/toolHandlers/boundingBoxToolHandler.ts
@@ -1,13 +1,13 @@
 import { v4 as uuidv4 } from 'uuid';
-import type { Annotation, BoundingBoxAnnotationData } from '@/types/workspace/annotation';
-import { AnnotationType } from '@/types/workspace/annotation';
+import type { Annotation, BoundingBoxAnnotationData } from '@/core/workspace/annotation.types';
+import { AnnotationType } from '@/core/workspace/annotation.types';
 import type { ToolHandler } from './toolHandler';
 import type { useWorkspaceStore } from '@/stores/workspaceStore';
-import { StoreError, ToolError } from '@/types/common/errors';
-import { drawBoundingBox } from '@/core/annotationWorkspace/annotationDrawer';
-import { calculateRenderSizes } from '@/core/annotationWorkspace/annotationRenderer';
-import { clampPointToImageBounds } from '@/core/annotationWorkspace/geometry';
-import type { Point } from '@/types/common/point';
+import { StoreError, ToolError } from '@/core/errors/errors';
+import { drawBoundingBox } from '@/core/annotations/annotationDrawer';
+import { calculateRenderSizes } from '@/core/annotations/annotationRenderer';
+import { clampPointToImageBounds } from '@/core/workspace/geometry/geometry';
+import type { Point } from '@/core/geometry/geometry.types';
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>;
 
diff --git a/frontend/src/core/annotationWorkspace/toolHandlers/lineToolHandler.ts b/frontend/src/core/workspace/interaction/toolHandlers/lineToolHandler.ts
similarity index 89%
rename from frontend/src/core/annotationWorkspace/toolHandlers/lineToolHandler.ts
rename to frontend/src/core/workspace/interaction/toolHandlers/lineToolHandler.ts
index 7f141c1f..55e961a6 100644
--- a/frontend/src/core/annotationWorkspace/toolHandlers/lineToolHandler.ts
+++ b/frontend/src/core/workspace/interaction/toolHandlers/lineToolHandler.ts
@@ -1,13 +1,13 @@
 import { v4 as uuidv4 } from 'uuid';
-import type { Annotation, LineAnnotationData } from '@/types/workspace/annotation';
-import { AnnotationType } from '@/types/workspace/annotation';
+import type { Annotation, LineAnnotationData } from '@/core/workspace/annotation.types';
+import { AnnotationType } from '@/core/workspace/annotation.types';
 import type { ToolHandler } from './toolHandler';
 import type { useWorkspaceStore } from '@/stores/workspaceStore';
-import { StoreError, ToolError } from '@/types/common/errors';
-import { drawLine } from '@/core/annotationWorkspace/annotationDrawer';
-import { calculateRenderSizes } from '@/core/annotationWorkspace/annotationRenderer';
-import { clampPointToImageBounds } from '@/core/annotationWorkspace/geometry';
-import type { Point } from '@/types/common/point';
+import { StoreError, ToolError } from '@/core/errors/errors';
+import { drawLine } from '@/core/annotations/annotationDrawer';
+import { calculateRenderSizes } from '@/core/annotations/annotationRenderer';
+import { clampPointToImageBounds } from '@/core/workspace/geometry/geometry';
+import type { Point } from '@/core/geometry/geometry.types';
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>;
 
diff --git a/frontend/src/core/annotationWorkspace/toolHandlers/pointToolHandler.ts b/frontend/src/core/workspace/interaction/toolHandlers/pointToolHandler.ts
similarity index 87%
rename from frontend/src/core/annotationWorkspace/toolHandlers/pointToolHandler.ts
rename to frontend/src/core/workspace/interaction/toolHandlers/pointToolHandler.ts
index e8d4ff82..b1c60d80 100644
--- a/frontend/src/core/annotationWorkspace/toolHandlers/pointToolHandler.ts
+++ b/frontend/src/core/workspace/interaction/toolHandlers/pointToolHandler.ts
@@ -1,11 +1,11 @@
 import { v4 as uuidv4 } from 'uuid';
-import type { Annotation, PointAnnotationData } from '@/types/workspace/annotation';
-import { AnnotationType } from '@/types/workspace/annotation';
+import type { Annotation, PointAnnotationData } from '@/core/workspace/annotation.types';
+import { AnnotationType } from '@/core/workspace/annotation.types';
 import type { ToolHandler } from './toolHandler';
 import type { useWorkspaceStore } from '@/stores/workspaceStore';
-import { StoreError, ToolError } from '@/types/common/errors';
-import { clampPointToImageBounds } from '@/core/annotationWorkspace/geometry';
-import type { Point } from '@/types/common/point';
+import { StoreError, ToolError } from '@/core/errors/errors';
+import { clampPointToImageBounds } from '@/core/workspace/geometry/geometry';
+import type { Point } from '@/core/geometry/geometry.types';
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>;
 
diff --git a/frontend/src/core/annotationWorkspace/toolHandlers/polygonToolHandler.ts b/frontend/src/core/workspace/interaction/toolHandlers/polygonToolHandler.ts
similarity index 94%
rename from frontend/src/core/annotationWorkspace/toolHandlers/polygonToolHandler.ts
rename to frontend/src/core/workspace/interaction/toolHandlers/polygonToolHandler.ts
index 53c6cc1f..e0cdd26e 100644
--- a/frontend/src/core/annotationWorkspace/toolHandlers/polygonToolHandler.ts
+++ b/frontend/src/core/workspace/interaction/toolHandlers/polygonToolHandler.ts
@@ -1,13 +1,13 @@
 import { v4 as uuidv4 } from 'uuid';
-import type { Annotation, PolygonAnnotationData } from '@/types/workspace/annotation';
-import { AnnotationType } from '@/types/workspace/annotation';
+import type { Annotation, PolygonAnnotationData } from '@/core/workspace/annotation.types';
+import { AnnotationType } from '@/core/workspace/annotation.types';
 import type { ToolHandler } from './toolHandler';
 import type { useWorkspaceStore } from '@/stores/workspaceStore';
-import { StoreError, ToolError } from '@/types/common/errors';
-import { drawPoint } from '@/core/annotationWorkspace/annotationDrawer';
-import { calculateRenderSizes } from '@/core/annotationWorkspace/annotationRenderer';
-import { clampPointToImageBounds } from '@/core/annotationWorkspace/geometry';
-import type { Point } from '@/types/common/point';
+import { StoreError, ToolError } from '@/core/errors/errors';
+import { drawPoint } from '@/core/annotations/annotationDrawer';
+import { calculateRenderSizes } from '@/core/annotations/annotationRenderer';
+import { clampPointToImageBounds } from '@/core/workspace/geometry/geometry';
+import type { Point } from '@/core/geometry/geometry.types';
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>;
 
diff --git a/frontend/src/core/annotationWorkspace/toolHandlers/polylineToolHandler.ts b/frontend/src/core/workspace/interaction/toolHandlers/polylineToolHandler.ts
similarity index 93%
rename from frontend/src/core/annotationWorkspace/toolHandlers/polylineToolHandler.ts
rename to frontend/src/core/workspace/interaction/toolHandlers/polylineToolHandler.ts
index 936c7267..28c18fa3 100644
--- a/frontend/src/core/annotationWorkspace/toolHandlers/polylineToolHandler.ts
+++ b/frontend/src/core/workspace/interaction/toolHandlers/polylineToolHandler.ts
@@ -1,13 +1,13 @@
 import { v4 as uuidv4 } from 'uuid';
-import type { Annotation, PolylineAnnotationData } from '@/types/workspace/annotation';
-import { AnnotationType } from '@/types/workspace/annotation';
+import type { Annotation, PolylineAnnotationData } from '@/core/workspace/annotation.types';
+import { AnnotationType } from '@/core/workspace/annotation.types';
 import type { ToolHandler } from './toolHandler';
 import type { useWorkspaceStore } from '@/stores/workspaceStore';
-import { StoreError, ToolError } from '@/types/common/errors';
-import { drawPolyline, drawPoint } from '@/core/annotationWorkspace/annotationDrawer';
-import { calculateRenderSizes } from '@/core/annotationWorkspace/annotationRenderer';
-import { clampPointToImageBounds } from '@/core/annotationWorkspace/geometry';
-import type { Point } from '@/types/common/point';
+import { StoreError, ToolError } from '@/core/errors/errors';
+import { drawPolyline, drawPoint } from '@/core/annotations/annotationDrawer';
+import { calculateRenderSizes } from '@/core/annotations/annotationRenderer';
+import { clampPointToImageBounds } from '@/core/workspace/geometry/geometry';
+import type { Point } from '@/core/geometry/geometry.types';
 
 type WorkspaceStore = ReturnType<typeof useWorkspaceStore>;
 
diff --git a/frontend/src/core/annotationWorkspace/toolHandlers/toolHandler.ts b/frontend/src/core/workspace/interaction/toolHandlers/toolHandler.ts
similarity index 100%
rename from frontend/src/core/annotationWorkspace/toolHandlers/toolHandler.ts
rename to frontend/src/core/workspace/interaction/toolHandlers/toolHandler.ts
diff --git a/frontend/src/core/workspace/task/__tests__/taskManager.test.ts b/frontend/src/core/workspace/task/__tests__/taskManager.test.ts
new file mode 100644
index 00000000..2998a7a6
--- /dev/null
+++ b/frontend/src/core/workspace/task/__tests__/taskManager.test.ts
@@ -0,0 +1,536 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { TaskManager } from '../taskManager';
+import { TaskNavigationManager } from '../taskNavigationManager';
+import type { Task } from '@/services/project/task/task.types';
+import { TaskStatus } from '@/services/project/task/task.types';
+import type { PipelineResultDto } from '@/services/project/task/task.types';
+
+// Mock logger
+const mockLogger = {
+    info: vi.fn(),
+    error: vi.fn(),
+    warn: vi.fn(),
+    debug: vi.fn()
+};
+
+// Mock task service
+const mockTaskService = {
+    getTaskById: vi.fn(),
+    getTasksForAsset: vi.fn(),
+    getTasksForStage: vi.fn(),
+    completeTaskPipeline: vi.fn(),
+    vetoTaskPipeline: vi.fn(),
+    changeTaskStatus: vi.fn(),
+    updateWorkingTime: vi.fn(),
+    saveWorkingTimeBeforeUnload: vi.fn()
+};
+
+// Mock permissions
+const mockPermissions = {
+    canUpdateProject: vi.fn()
+};
+
+// Mock timer
+const mockTimer = {
+    getElapsedTime: vi.fn(() => 1000),
+    isRunning: vi.fn(() => true)
+};
+
+// Test data
+const mockTask: Task = {
+    id: 1,
+    priority: 1,
+    workingTimeMs: 5000,
+    createdAt: '2024-01-01T00:00:00Z',
+    updatedAt: '2024-01-01T00:00:00Z',
+    assetId: 1,
+    projectId: 1,
+    workflowId: 1,
+    workflowStageId: 1,
+    status: TaskStatus.IN_PROGRESS,
+    assignedToEmail: 'test@example.com'
+};
+
+const mockCompletedTask: Task = {
+    ...mockTask,
+    status: TaskStatus.COMPLETED,
+    completedAt: '2024-01-01T01:00:00Z'
+};
+
+const mockSuspendedTask: Task = {
+    ...mockTask,
+    status: TaskStatus.SUSPENDED,
+    suspendedAt: '2024-01-01T01:00:00Z'
+};
+
+const mockDeferredTask: Task = {
+    ...mockTask,
+    status: TaskStatus.DEFERRED,
+    deferredAt: '2024-01-01T01:00:00Z'
+};
+
+const mockPipelineSuccess: PipelineResultDto = {
+    isSuccess: true,
+    updatedTask: mockCompletedTask,
+    details: 'Task completed successfully'
+};
+
+const mockPipelineFailure: PipelineResultDto = {
+    isSuccess: false,
+    errorMessage: 'Pipeline failed'
+};
+
+describe('TaskManager', () => {
+    let taskManager: TaskManager;
+
+    beforeEach(() => {
+        vi.clearAllMocks();
+        taskManager = new TaskManager(
+            mockTaskService as any,
+            mockPermissions as any,
+            mockTimer as any,
+        );
+    });
+
+    describe('Task Completion', () => {
+        it('should complete a task successfully using pipeline system', async () => {
+            mockTaskService.completeTaskPipeline.mockResolvedValue(mockPipelineSuccess);
+            mockTaskService.getTaskById.mockResolvedValue(mockCompletedTask);
+
+            const result = await taskManager.completeTask(123, 1);
+
+            expect(result.success).toBe(true);
+            expect(result.task).toEqual(mockCompletedTask);
+            expect(result.message).toContain('successfully completed');
+            expect(mockTaskService.completeTaskPipeline).toHaveBeenCalledWith(123, 1);
+            expect(mockTaskService.getTaskById).toHaveBeenCalledWith(123, 1);
+        });
+
+        it('should handle task completion failure', async () => {
+            mockTaskService.completeTaskPipeline.mockResolvedValue(mockPipelineFailure);
+
+            const result = await taskManager.completeTask(123, 1);
+
+            expect(result.success).toBe(false);
+            expect(result.error).toBe('Pipeline failed');
+        });
+
+        it('should handle task completion with service error', async () => {
+            mockTaskService.completeTaskPipeline.mockRejectedValue(new Error('Service error'));
+
+            const result = await taskManager.completeTask(123, 1);
+
+            expect(result.success).toBe(false);
+            expect(result.error).toBe('Service error');
+        });
+    });
+
+    describe('Task Suspension', () => {
+        it('should suspend a task successfully with working time preservation', async () => {
+            mockTaskService.changeTaskStatus.mockResolvedValue(mockSuspendedTask);
+
+            const result = await taskManager.suspendTask(123, 1, 2000);
+
+            expect(result.success).toBe(true);
+            expect(result.task).toEqual(mockSuspendedTask);
+            expect(mockTaskService.changeTaskStatus).toHaveBeenCalledWith(
+                123, 1, { targetStatus: TaskStatus.SUSPENDED }
+            );
+        });
+
+        it('should handle task suspension failure', async () => {
+            mockTaskService.changeTaskStatus.mockRejectedValue(new Error('Suspension failed'));
+
+            const result = await taskManager.suspendTask(123, 1, 2000);
+
+            expect(result.success).toBe(false);
+            expect(result.error).toBe('Suspension failed');
+        });
+
+        it('should properly preserve working time during suspension', async () => {
+            const currentWorkingTime = 5000;
+            const elapsedTime = 3000;
+            const expectedTotalTime = currentWorkingTime + elapsedTime;
+            
+            mockTimer.getElapsedTime.mockReturnValue(elapsedTime);
+            mockTaskService.changeTaskStatus.mockResolvedValue({
+                ...mockSuspendedTask,
+                workingTimeMs: expectedTotalTime
+            });
+
+            const result = await taskManager.suspendTask(123, 1, currentWorkingTime);
+
+            expect(result.success).toBe(true);
+            // The manager should calculate total time and pass it through
+            expect(mockTaskService.changeTaskStatus).toHaveBeenCalledWith(
+                123, 1, { targetStatus: TaskStatus.SUSPENDED }
+            );
+        });
+    });
+
+    describe('Task Deferring', () => {
+        it('should defer a task successfully', async () => {
+            mockTaskService.changeTaskStatus.mockResolvedValue(mockDeferredTask);
+
+            const result = await taskManager.deferTask(123, 1, 2000);
+
+            expect(result.success).toBe(true);
+            expect(result.task).toEqual(mockDeferredTask);
+            expect(mockTaskService.changeTaskStatus).toHaveBeenCalledWith(
+                123, 1, { targetStatus: TaskStatus.DEFERRED }
+            );
+        });
+
+        it('should handle task deferring failure', async () => {
+            mockTaskService.changeTaskStatus.mockRejectedValue(new Error('Defer failed'));
+
+            const result = await taskManager.deferTask(123, 1, 2000);
+
+            expect(result.success).toBe(false);
+            expect(result.error).toBe('Defer failed');
+        });
+    });
+
+    describe('Task Veto', () => {
+        it('should veto a task successfully with reason', async () => {
+            const vetoResult = { ...mockPipelineSuccess, updatedTask: { ...mockTask, status: TaskStatus.VETOED } };
+            mockTaskService.vetoTaskPipeline.mockResolvedValue(vetoResult);
+
+            const result = await taskManager.vetoTask(123, 1, 'Quality issues');
+
+            expect(result.success).toBe(true);
+            expect(result.task?.status).toBe(TaskStatus.VETOED);
+            expect(mockTaskService.vetoTaskPipeline).toHaveBeenCalledWith(123, 1, {
+                reason: 'Quality issues'
+            });
+        });
+
+        it('should handle task veto failure', async () => {
+            mockTaskService.vetoTaskPipeline.mockResolvedValue(mockPipelineFailure);
+
+            const result = await taskManager.vetoTask(123, 1, 'Quality issues');
+
+            expect(result.success).toBe(false);
+            expect(result.error).toBe('Pipeline failed');
+        });
+
+        it('should use default reason when none provided', async () => {
+            const vetoResult = { ...mockPipelineSuccess, updatedTask: { ...mockTask, status: TaskStatus.VETOED } };
+            mockTaskService.vetoTaskPipeline.mockResolvedValue(vetoResult);
+
+            await taskManager.vetoTask(123, 1);
+
+            expect(mockTaskService.vetoTaskPipeline).toHaveBeenCalledWith(123, 1, {
+                reason: 'Task returned for rework'
+            });
+        });
+    });
+
+    describe('Task Validation', () => {
+        it('should correctly identify if task can be completed', () => {
+            const inProgressTask = { ...mockTask, status: TaskStatus.IN_PROGRESS };
+            const completedTask = { ...mockTask, status: TaskStatus.COMPLETED };
+            const suspendedTask = { ...mockTask, status: TaskStatus.SUSPENDED };
+
+            expect(taskManager.canCompleteTask(inProgressTask)).toBe(true);
+            expect(taskManager.canCompleteTask(completedTask)).toBe(false);
+            expect(taskManager.canCompleteTask(suspendedTask)).toBe(false);
+        });
+
+        it('should validate task permissions correctly for regular tasks', async () => {
+            const result = await taskManager.canOpenTask(mockTask);
+            
+            expect(result).toBe(true);
+            // Regular tasks don't require permission checks
+            expect(mockPermissions.canUpdateProject).not.toHaveBeenCalled();
+        });
+
+        it('should handle deferred tasks requiring manager permissions', async () => {
+            const deferredTask = { ...mockTask, status: TaskStatus.DEFERRED };
+            mockPermissions.canUpdateProject.mockResolvedValue(false);
+
+            const result = await taskManager.canOpenTask(deferredTask);
+            
+            expect(result).toBe(false);
+        });
+
+        it('should allow managers to open deferred tasks', async () => {
+            const deferredTask = { ...mockTask, status: TaskStatus.DEFERRED };
+            mockPermissions.canUpdateProject.mockResolvedValue(true);
+
+            const result = await taskManager.canOpenTask(deferredTask);
+            
+            expect(result).toBe(true);
+        });
+    });
+
+    describe('Working Time Management', () => {
+        it('should calculate total working time correctly', () => {
+            const currentTime = 5000;
+            const elapsedTime = 3000;
+            mockTimer.getElapsedTime.mockReturnValue(elapsedTime);
+
+            const totalTime = taskManager.calculateTotalWorkingTime(currentTime);
+
+            expect(totalTime).toBe(8000);
+            expect(mockTimer.getElapsedTime).toHaveBeenCalled();
+        });
+
+        it('should return current time if timer is not running', () => {
+            const currentTime = 5000;
+            mockTimer.isRunning.mockReturnValue(false);
+            mockTimer.getElapsedTime.mockReturnValue(0);
+
+            const totalTime = taskManager.calculateTotalWorkingTime(currentTime);
+
+            expect(totalTime).toBe(5000);
+        });
+    });
+
+    describe('Error Handling', () => {
+        it('should log appropriate errors for each operation', async () => {
+            mockTaskService.completeTaskPipeline.mockRejectedValue(new Error('Test error'));
+
+            await taskManager.completeTask(123, 1);
+
+            expect(mockLogger.error).toHaveBeenCalledWith(
+                'Failed to complete task via pipeline:',
+                expect.any(Error)
+            );
+        });
+
+        it('should handle non-Error exceptions', async () => {
+            mockTaskService.completeTaskPipeline.mockRejectedValue('String error');
+
+            const result = await taskManager.completeTask(123, 1);
+
+            expect(result.success).toBe(false);
+            expect(result.error).toBe('Failed to complete task');
+        });
+    });
+});
+
+describe('TaskNavigationManager', () => {
+    let navigationManager: TaskNavigationManager;
+    
+    const mockTasks: Task[] = [
+        { ...mockTask, id: 1, status: TaskStatus.COMPLETED },
+        { ...mockTask, id: 2, status: TaskStatus.IN_PROGRESS },
+        { ...mockTask, id: 3, status: TaskStatus.NOT_STARTED },
+        { ...mockTask, id: 4, status: TaskStatus.COMPLETED }
+    ];
+
+    beforeEach(() => {
+        vi.clearAllMocks();
+        navigationManager = new TaskNavigationManager(
+            mockPermissions as any,
+        );
+    });
+
+    describe('Next Task Navigation', () => {
+        it('should find next available task', async () => {
+            mockPermissions.canUpdateProject.mockResolvedValue(true);
+            
+            const result = await navigationManager.navigateToNext(
+                mockTasks[1], // current task (id: 2)
+                mockTasks,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toEqual({
+                projectId: '123',
+                assetId: '1',
+                taskId: '3'
+            });
+        });
+
+        it('should return null when no next task available', async () => {
+            mockPermissions.canUpdateProject.mockResolvedValue(true);
+            
+            const result = await navigationManager.navigateToNext(
+                mockTasks[3], // current task (id: 4) - last task
+                mockTasks,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toBeNull();
+        });
+
+        it('should skip tasks that cannot be opened', async () => {
+            // Mock deferred task that requires manager permissions
+            const tasksWithDeferred = [
+                ...mockTasks,
+                { ...mockTask, id: 5, status: TaskStatus.DEFERRED }
+            ];
+            
+            // User is not a manager
+            mockPermissions.canUpdateProject.mockResolvedValue(false);
+            
+            const result = await navigationManager.navigateToNext(
+                mockTasks[1],
+                tasksWithDeferred,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            // Should skip deferred task and go to id: 3
+            expect(result.navigation?.taskId).toBe('3');
+        });
+    });
+
+    describe('Previous Task Navigation', () => {
+        it('should find previous available task', async () => {
+            mockPermissions.canUpdateProject.mockResolvedValue(true);
+            
+            const result = await navigationManager.navigateToPrevious(
+                mockTasks[2], // current task (id: 3)
+                mockTasks,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toEqual({
+                projectId: '123',
+                assetId: '1',
+                taskId: '2'
+            });
+        });
+
+        it('should return null when no previous task available', async () => {
+            mockPermissions.canUpdateProject.mockResolvedValue(true);
+            
+            const result = await navigationManager.navigateToPrevious(
+                mockTasks[0], // first task
+                mockTasks,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toBeNull();
+        });
+    });
+
+    describe('Next Available Task (Completion Helper)', () => {
+        it('should find next uncompleted task', async () => {
+            const result = await navigationManager.getNextAvailableTask(
+                mockTasks[1], // current task (id: 2)
+                mockTasks,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toEqual({
+                projectId: '123',
+                assetId: '1',
+                taskId: '3'
+            });
+        });
+
+        it('should wrap around to beginning if needed', async () => {
+            const tasksWithGap = [
+                { ...mockTask, id: 1, status: TaskStatus.NOT_STARTED },
+                { ...mockTask, id: 2, status: TaskStatus.COMPLETED },
+                { ...mockTask, id: 3, status: TaskStatus.COMPLETED }
+            ];
+            
+            const result = await navigationManager.getNextAvailableTask(
+                tasksWithGap[2], // last task
+                tasksWithGap,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation?.taskId).toBe('1');
+        });
+
+        it('should return null when all tasks are completed', async () => {
+            const completedTasks = mockTasks.map(task => ({
+                ...task,
+                status: TaskStatus.COMPLETED,
+                completedAt: '2024-01-01T01:00:00Z'
+            }));
+            
+            const result = await navigationManager.getNextAvailableTask(
+                completedTasks[1],
+                completedTasks,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toBeNull();
+        });
+    });
+
+    describe('Navigation Info', () => {
+        it('should provide correct navigation information', () => {
+            const info = navigationManager.getNavigationInfo(
+                mockTasks[1],
+                mockTasks
+            );
+
+            expect(info.currentIndex).toBe(1);
+            expect(info.totalTasks).toBe(4);
+            expect(info.hasNext).toBe(true);
+            expect(info.hasPrevious).toBe(true);
+        });
+
+        it('should handle edge cases correctly', () => {
+            // First task
+            const firstInfo = navigationManager.getNavigationInfo(
+                mockTasks[0],
+                mockTasks
+            );
+            expect(firstInfo.currentIndex).toBe(0);
+            expect(firstInfo.hasPrevious).toBe(false);
+            expect(firstInfo.hasNext).toBe(true);
+
+            // Last task
+            const lastInfo = navigationManager.getNavigationInfo(
+                mockTasks[mockTasks.length - 1],
+                mockTasks
+            );
+            expect(lastInfo.currentIndex).toBe(3);
+            expect(lastInfo.hasPrevious).toBe(true);
+            expect(lastInfo.hasNext).toBe(false);
+        });
+
+        it('should handle single task scenario', () => {
+            const singleTask = [mockTasks[0]];
+            const info = navigationManager.getNavigationInfo(
+                singleTask[0],
+                singleTask
+            );
+
+            expect(info.currentIndex).toBe(0);
+            expect(info.totalTasks).toBe(1);
+            expect(info.hasNext).toBe(false);
+            expect(info.hasPrevious).toBe(false);
+        });
+    });
+
+    describe('Error Handling', () => {
+        it('should handle empty task list', async () => {
+            const result = await navigationManager.navigateToNext(
+                mockTask,
+                [],
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toBeNull();
+        });
+
+        it('should handle missing current task', async () => {
+            const result = await navigationManager.navigateToNext(
+                { ...mockTask, id: 999 }, // not in the list
+                mockTasks,
+                '123'
+            );
+
+            expect(result.success).toBe(true);
+            expect(result.navigation).toBeNull();
+        });
+    });
+});
\ No newline at end of file
diff --git a/frontend/src/core/workspace/task/index.ts b/frontend/src/core/workspace/task/index.ts
new file mode 100644
index 00000000..cbcbf2eb
--- /dev/null
+++ b/frontend/src/core/workspace/task/index.ts
@@ -0,0 +1,8 @@
+export { TaskManager } from './taskManager';
+export { TaskNavigationManager } from './taskNavigationManager';
+
+// Re-export types from their proper location
+export type { TaskResult, TaskService, PermissionsService } from './taskManager.types';
+export type { NavigationResult, NavigationInfo } from './taskNavigationManager.types';
+export type { TimerService } from '@/core/timing';
+// Logger is used via AppLogger.createServiceLogger() - no type export needed
\ No newline at end of file
diff --git a/frontend/src/core/workspace/task/taskManager.ts b/frontend/src/core/workspace/task/taskManager.ts
new file mode 100644
index 00000000..7af70dec
--- /dev/null
+++ b/frontend/src/core/workspace/task/taskManager.ts
@@ -0,0 +1,293 @@
+import type { Task, TaskStatus } from '@/services/project/task/task.types';
+import type { TaskResult, TaskService, PermissionsService } from './taskManager.types';
+import type { TimerService } from '@/core/timing';
+import { AppLogger } from '@/core/logger/logger';
+
+/**
+ * Core business logic for task management operations.
+ * Handles task completion, suspension, deferring, veto operations,
+ * and task status validations.
+ */
+export class TaskManager {
+    private logger = AppLogger.createServiceLogger('TaskManager');
+
+    constructor(
+        private taskService: TaskService,
+        private permissions: PermissionsService,
+        private timer: TimerService
+    ) {}
+
+    /**
+     * Complete a task using the pipeline system
+     * @param projectId - The project ID
+     * @param taskId - The task ID to complete
+     * @returns Promise resolving to TaskResult
+     */
+    async completeTask(projectId: number, taskId: number): Promise<TaskResult> {
+        try {
+            this.logger.info('Completing task using pipeline system', { taskId });
+            
+            const result = await this.taskService.completeTaskPipeline(projectId, taskId);
+            
+            if (!result.isSuccess) {
+                return {
+                    success: false,
+                    error: result.errorMessage || 'Task completion failed'
+                };
+            }
+            
+            // Refresh current task data
+            const updatedTask = await this.taskService.getTaskById(projectId, taskId);
+            
+            this.logger.info(`Successfully completed task ${taskId} via pipeline`, { details: result.details });
+            
+            return {
+                success: true,
+                task: updatedTask,
+                message: `Task ${taskId} successfully completed via pipeline`,
+                error: undefined
+            };
+        } catch (error) {
+            this.logger.error('Failed to complete task via pipeline:', error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : 'Failed to complete task'
+            };
+        }
+    }
+
+    /**
+     * Suspend a task with working time preservation
+     * @param projectId - The project ID
+     * @param taskId - The task ID to suspend
+     * @param currentWorkingTime - Current working time in milliseconds
+     * @returns Promise resolving to TaskResult
+     */
+    async suspendTask(projectId: number, taskId: number, currentWorkingTime: number): Promise<TaskResult> {
+        try {
+            // Calculate total working time including current session
+            const totalWorkingTime = this.calculateTotalWorkingTime(currentWorkingTime);
+            
+            this.logger.info('Suspending task with working time preservation', { 
+                taskId, 
+                currentTime: currentWorkingTime, 
+                totalTime: totalWorkingTime 
+            });
+            
+            // Use the shared working time preservation logic
+            const suspendedTask = await this._saveWorkingTimeAndChangeStatus(
+                () => this.taskService.changeTaskStatus(projectId, taskId, { targetStatus: 'SUSPENDED' as TaskStatus }),
+                'suspension',
+                projectId,
+                taskId,
+                totalWorkingTime
+            );
+            
+            this.logger.info(`Successfully suspended task ${taskId}`);
+            
+            return {
+                success: true,
+                task: suspendedTask,
+                message: `Task ${taskId} successfully suspended`,
+                error: undefined
+            };
+        } catch (error) {
+            this.logger.error('Failed to suspend task:', error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : 'Failed to suspend task'
+            };
+        }
+    }
+
+    /**
+     * Defer a task (skip for now) with working time preservation
+     * @param projectId - The project ID  
+     * @param taskId - The task ID to defer
+     * @param currentWorkingTime - Current working time in milliseconds
+     * @returns Promise resolving to TaskResult
+     */
+    async deferTask(projectId: number, taskId: number, currentWorkingTime: number): Promise<TaskResult> {
+        try {
+            // Calculate total working time including current session
+            const totalWorkingTime = this.calculateTotalWorkingTime(currentWorkingTime);
+            
+            this.logger.info('Deferring task with working time preservation', { 
+                taskId, 
+                currentTime: currentWorkingTime, 
+                totalTime: totalWorkingTime 
+            });
+            
+            // Use the shared working time preservation logic
+            const deferredTask = await this._saveWorkingTimeAndChangeStatus(
+                () => this.taskService.changeTaskStatus(projectId, taskId, { targetStatus: 'DEFERRED' as TaskStatus }),
+                'deferring',
+                projectId,
+                taskId,
+                totalWorkingTime
+            );
+            
+            this.logger.info(`Successfully deferred task ${taskId}`);
+            
+            return {
+                success: true,
+                task: deferredTask,
+                message: `Task ${taskId} successfully deferred`,
+                error: undefined
+            };
+        } catch (error) {
+            this.logger.error('Failed to defer task:', error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : 'Failed to defer task'
+            };
+        }
+    }
+
+    /**
+     * Veto/return a task for rework using the veto pipeline
+     * @param projectId - The project ID
+     * @param taskId - The task ID to veto
+     * @param reason - Optional reason for the veto
+     * @returns Promise resolving to TaskResult
+     */
+    async vetoTask(projectId: number, taskId: number, reason?: string): Promise<TaskResult> {
+        try {
+            const vetoReason = reason || 'Task returned for rework';
+            
+            this.logger.info('Returning task for rework using veto pipeline', { taskId, reason: vetoReason });
+            
+            // Use the veto pipeline to handle all operations atomically
+            const pipelineResult = await this.taskService.vetoTaskPipeline(projectId, taskId, {
+                reason: vetoReason
+            });
+            
+            if (!pipelineResult.isSuccess) {
+                return {
+                    success: false,
+                    error: pipelineResult.errorMessage || 'Veto pipeline failed'
+                };
+            }
+            
+            this.logger.info(`Successfully returned task ${taskId} for rework`, { reason: vetoReason });
+            
+            return {
+                success: true,
+                task: pipelineResult.updatedTask,
+                message: `Task ${taskId} successfully returned for rework`,
+                error: undefined
+            };
+        } catch (error) {
+            this.logger.error('Failed to return task for rework:', error);
+            return {
+                success: false,
+                error: error instanceof Error ? error.message : 'Failed to return task for rework'
+            };
+        }
+    }
+
+    /**
+     * Check if a task can be completed based on its current status
+     * @param task - The task to check
+     * @returns Boolean indicating if the task can be completed
+     */
+    canCompleteTask(task: Task): boolean {
+        // Only tasks that are in progress or ready states can be completed
+        const completableStatuses = [
+            'IN_PROGRESS' as TaskStatus,
+            'READY_FOR_ANNOTATION' as TaskStatus,
+            'READY_FOR_REVIEW' as TaskStatus,
+            'READY_FOR_COMPLETION' as TaskStatus,
+            'CHANGES_REQUIRED' as TaskStatus
+        ];
+        
+        return task.status ? completableStatuses.includes(task.status) : false;
+    }
+
+    /**
+     * Check if a task can be opened by the current user
+     * @param task - The task to check
+     * @returns Promise resolving to boolean indicating if the task can be opened
+     */
+    async canOpenTask(task: Task): Promise<boolean> {
+        // Deferred tasks can only be opened by managers
+        if (task.status === 'DEFERRED') {
+            return await this.permissions.canUpdateProject();
+        }
+        
+        // Vetoed tasks cannot be opened (they are view-only)
+        if (task.status === 'VETOED') {
+            return false;
+        }
+        
+        // Completed and archived tasks cannot be opened
+        if (task.status && ['COMPLETED', 'ARCHIVED'].includes(task.status as string)) {
+            return false;
+        }
+        
+        // All other tasks can be opened if user has basic permissions
+        return true;
+    }
+
+    /**
+     * Calculate total working time including current timer session
+     * @param currentWorkingTime - Current saved working time in milliseconds
+     * @returns Total working time in milliseconds
+     */
+    calculateTotalWorkingTime(currentWorkingTime: number): number {
+        if (!this.timer.isRunning()) {
+            return currentWorkingTime;
+        }
+        
+        const elapsedTime = this.timer.getElapsedTime();
+        return currentWorkingTime + elapsedTime;
+    }
+
+    /**
+     * Common helper to save working time and preserve it across task status changes
+     * @private
+     * @param statusChangeOperation - Function that performs the status change and returns the updated task
+     * @param operationName - Name of the operation for logging (e.g., "completion", "suspension")
+     * @param projectId - The project ID
+     * @param taskId - The task ID  
+     * @param finalWorkingTime - The final working time to preserve
+     */
+    private async _saveWorkingTimeAndChangeStatus<T extends Task>(
+        statusChangeOperation: () => Promise<T>,
+        operationName: string,
+        projectId: number,
+        taskId: number,
+        finalWorkingTime: number
+    ): Promise<T> {
+        this.logger.info(`Starting ${operationName} with working time preservation`, { 
+            taskId, 
+            finalWorkingTime 
+        });
+        
+        // Execute the status change operation
+        const updatedTask = await statusChangeOperation();
+        
+        // Ensure the working time is preserved in case the backend didn't return the latest value
+        if (updatedTask.workingTimeMs < finalWorkingTime) {
+            this.logger.warn(`Working time mismatch after ${operationName}. Backend: ${updatedTask.workingTimeMs}ms, Expected: ${finalWorkingTime}ms. Updating...`);
+            try {
+                const correctedTask = await this.taskService.updateWorkingTime(projectId, taskId, finalWorkingTime);
+                this.logger.info(`Working time corrected after ${operationName}`, { 
+                    taskId, 
+                    correctedTime: correctedTask.workingTimeMs 
+                });
+                return correctedTask as T;
+            } catch (correctionError) {
+                this.logger.error(`Failed to correct working time after ${operationName}:`, correctionError);
+                // Return the original task even if correction failed
+                return updatedTask;
+            }
+        }
+        
+        this.logger.info(`${operationName} completed successfully with preserved working time`, { 
+            taskId, 
+            workingTime: updatedTask.workingTimeMs 
+        });
+        return updatedTask;
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/core/workspace/task/taskManager.types.ts b/frontend/src/core/workspace/task/taskManager.types.ts
new file mode 100644
index 00000000..872b6e91
--- /dev/null
+++ b/frontend/src/core/workspace/task/taskManager.types.ts
@@ -0,0 +1,33 @@
+import type { Task, TaskStatus, PipelineResultDto } from '@/services/project/task/task.types';
+import type { GetTasksResponse } from '@/services/project/task/taskService.types';
+
+/**
+ * Result types for task operations
+ */
+export interface TaskResult {
+    success: boolean;
+    task?: Task;
+    message?: string;
+    error?: string;
+}
+
+/**
+ * Interface for task service dependency
+ */
+export interface TaskService {
+    getTaskById(projectId: number, taskId: number): Promise<Task>;
+    getTasksForAsset(projectId: number, assetId: number): Promise<Task[]>;
+    getTasksForStage(projectId: number, stageId: number): Promise<GetTasksResponse>;
+    completeTaskPipeline(projectId: number, taskId: number): Promise<PipelineResultDto>;
+    vetoTaskPipeline(projectId: number, taskId: number, data: { reason: string }): Promise<PipelineResultDto>;
+    changeTaskStatus(projectId: number, taskId: number, data: { targetStatus: TaskStatus }): Promise<Task>;
+    updateWorkingTime(projectId: number, taskId: number, workingTimeMs: number): Promise<Task>;
+    saveWorkingTimeBeforeUnload(projectId: number, taskId: number, workingTimeMs: number): Promise<boolean>;
+}
+
+/**
+ * Interface for permissions service dependency
+ */
+export interface PermissionsService {
+    canUpdateProject(): Promise<boolean>;
+}
\ No newline at end of file
diff --git a/frontend/src/core/workspace/task/taskNavigationManager.ts b/frontend/src/core/workspace/task/taskNavigationManager.ts
new file mode 100644
index 00000000..fb8d27fc
--- /dev/null
+++ b/frontend/src/core/workspace/task/taskNavigationManager.ts
@@ -0,0 +1,202 @@
+import type { Task } from '@/services/project/task/task.types';
+import type { NavigationResult, NavigationInfo } from './taskNavigationManager.types';
+import type { PermissionsService } from './taskManager.types';
+import { AppLogger } from '@/core/logger/logger';
+
+/**
+ * Core business logic for task navigation operations.
+ * Handles navigation between tasks, finding next/previous available tasks,
+ * and providing navigation state information.
+ */
+export class TaskNavigationManager {
+    private logger = AppLogger.createServiceLogger('TaskNavigationManager');
+
+    constructor(
+        private permissions: PermissionsService
+    ) {}
+
+    /**
+     * Navigate to the next available task that can be opened
+     * @param currentTask - Current task
+     * @param availableTasks - List of all available tasks
+     * @param projectId - Project ID for navigation
+     * @returns Promise resolving to NavigationResult
+     */
+    async navigateToNext(currentTask: Task, availableTasks: Task[], projectId: string): Promise<NavigationResult> {
+        if (availableTasks.length === 0) {
+            this.logger.warn('Cannot navigate to next task: no available tasks');
+            return { success: true, navigation: null };
+        }
+
+        const currentIndex = availableTasks.findIndex(task => task.id === currentTask.id);
+        
+        if (currentIndex === -1) {
+            this.logger.warn('Cannot navigate to next task: current task not found in available tasks');
+            return { success: true, navigation: null };
+        }
+        
+        // Look for the next available task that can be opened
+        for (let i = currentIndex + 1; i < availableTasks.length; i++) {
+            const nextTask = availableTasks[i];
+            const canOpen = await this._canOpenTask(nextTask);
+            
+            if (canOpen) {
+                this.logger.info(`Navigating to next task: ${nextTask.id} (asset ${nextTask.assetId})`);
+                return {
+                    success: true,
+                    navigation: {
+                        projectId,
+                        assetId: nextTask.assetId.toString(),
+                        taskId: nextTask.id.toString()
+                    }
+                };
+            } else {
+                this.logger.debug(`Skipping next task ${nextTask.id} - status: ${nextTask.status}`);
+            }
+        }
+        
+        this.logger.info('No accessible next task found');
+        return { success: true, navigation: null };
+    }
+
+    /**
+     * Navigate to the previous available task that can be opened
+     * @param currentTask - Current task
+     * @param availableTasks - List of all available tasks
+     * @param projectId - Project ID for navigation
+     * @returns Promise resolving to NavigationResult
+     */
+    async navigateToPrevious(currentTask: Task, availableTasks: Task[], projectId: string): Promise<NavigationResult> {
+        if (availableTasks.length === 0) {
+            this.logger.warn('Cannot navigate to previous task: no available tasks');
+            return { success: true, navigation: null };
+        }
+
+        const currentIndex = availableTasks.findIndex(task => task.id === currentTask.id);
+        
+        if (currentIndex === -1) {
+            this.logger.warn('Cannot navigate to previous task: current task not found in available tasks');
+            return { success: true, navigation: null };
+        }
+        
+        // Look for the previous available task that can be opened
+        for (let i = currentIndex - 1; i >= 0; i--) {
+            const previousTask = availableTasks[i];
+            const canOpen = await this._canOpenTask(previousTask);
+            
+            if (canOpen) {
+                this.logger.info(`Navigating to previous task: ${previousTask.id} (asset ${previousTask.assetId})`);
+                return {
+                    success: true,
+                    navigation: {
+                        projectId,
+                        assetId: previousTask.assetId.toString(),
+                        taskId: previousTask.id.toString()
+                    }
+                };
+            } else {
+                this.logger.debug(`Skipping previous task ${previousTask.id} - status: ${previousTask.status}`);
+            }
+        }
+        
+        this.logger.info('No accessible previous task found');
+        return { success: true, navigation: null };
+    }
+
+    /**
+     * Get the next available uncompleted task for seamless transitions after completion
+     * @param currentTask - Current task
+     * @param availableTasks - List of all available tasks
+     * @param projectId - Project ID for navigation
+     * @returns Promise resolving to NavigationResult
+     */
+    async getNextAvailableTask(currentTask: Task, availableTasks: Task[], projectId: string): Promise<NavigationResult> {
+        if (availableTasks.length === 0) {
+            this.logger.warn('Cannot get next task: no available tasks');
+            return { success: true, navigation: null };
+        }
+
+        const currentIndex = availableTasks.findIndex(task => task.id === currentTask.id);
+
+        if (currentIndex === -1) {
+            this.logger.warn('Cannot get next task: current task not found in available tasks');
+            return { success: true, navigation: null };
+        }
+
+        // Look for next uncompleted task
+        for (let i = currentIndex + 1; i < availableTasks.length; i++) {
+            const task = availableTasks[i];
+            if (!task.completedAt) {
+                return {
+                    success: true,
+                    navigation: {
+                        projectId,
+                        assetId: task.assetId.toString(),
+                        taskId: task.id.toString()
+                    }
+                };
+            }
+        }
+
+        // If no task found after current, wrap around to beginning
+        for (let i = 0; i < currentIndex; i++) {
+            const task = availableTasks[i];
+            if (!task.completedAt) {
+                return {
+                    success: true,
+                    navigation: {
+                        projectId,
+                        assetId: task.assetId.toString(),
+                        taskId: task.id.toString()
+                    }
+                };
+            }
+        }
+
+        this.logger.info('No more uncompleted tasks available');
+        return { success: true, navigation: null };
+    }
+
+    /**
+     * Get navigation information for the current task context
+     * @param currentTask - Current task
+     * @param availableTasks - List of all available tasks
+     * @returns NavigationInfo object with current position and navigation state
+     */
+    getNavigationInfo(currentTask: Task, availableTasks: Task[]): NavigationInfo {
+        const currentIndex = availableTasks.findIndex(task => task.id === currentTask.id);
+        
+        return {
+            currentIndex: currentIndex >= 0 ? currentIndex : 0,
+            totalTasks: availableTasks.length,
+            hasNext: currentIndex >= 0 && currentIndex < availableTasks.length - 1,
+            hasPrevious: currentIndex > 0
+        };
+    }
+
+    /**
+     * Check if a task can be opened by the current user
+     * @private
+     * @param task - The task to check
+     * @returns Promise resolving to boolean indicating if the task can be opened
+     */
+    private async _canOpenTask(task: Task): Promise<boolean> {
+        // Deferred tasks can only be opened by managers
+        if (task.status === 'DEFERRED') {
+            return await this.permissions.canUpdateProject();
+        }
+        
+        // Vetoed tasks cannot be opened (they are view-only)
+        if (task.status === 'VETOED') {
+            return false;
+        }
+        
+        // Completed and archived tasks cannot be opened
+        if (task.status && ['COMPLETED', 'ARCHIVED'].includes(task.status as string)) {
+            return false;
+        }
+        
+        // All other tasks can be opened
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/frontend/src/core/workspace/task/taskNavigationManager.types.ts b/frontend/src/core/workspace/task/taskNavigationManager.types.ts
new file mode 100644
index 00000000..60ebb37f
--- /dev/null
+++ b/frontend/src/core/workspace/task/taskNavigationManager.types.ts
@@ -0,0 +1,22 @@
+/**
+ * Result types for navigation operations
+ */
+export interface NavigationResult {
+    success: boolean;
+    navigation: {
+        projectId: string;
+        assetId: string;
+        taskId: string;
+    } | null;
+    error?: string;
+}
+
+/**
+ * Navigation information for UI state
+ */
+export interface NavigationInfo {
+    currentIndex: number;
+    totalTasks: number;
+    hasNext: boolean;
+    hasPrevious: boolean;
+}
\ No newline at end of file
diff --git a/frontend/src/types/workspace/tools.ts b/frontend/src/core/workspace/tools.types.ts
similarity index 100%
rename from frontend/src/types/workspace/tools.ts
rename to frontend/src/core/workspace/tools.types.ts
diff --git a/frontend/src/directives/vPermission.ts b/frontend/src/directives/vPermission.ts
index 6f0fca67..f934f622 100644
--- a/frontend/src/directives/vPermission.ts
+++ b/frontend/src/directives/vPermission.ts
@@ -2,8 +2,8 @@ import type { App, DirectiveBinding } from 'vue';
 import { watch } from 'vue';
 import { usePermissionStore } from '@/stores/permissionStore';
 import { useProjectStore } from '@/stores/projectStore';
-import { AppLogger } from '@/utils/logger';
-import type { PermissionDirectiveBinding } from '@/types/permissions';
+import { AppLogger } from '@/core/logger/logger';
+import type { PermissionDirectiveBinding } from '@/services/auth/permissions.types';
 
 const logger = AppLogger.createServiceLogger('vPermission');
 
diff --git a/frontend/src/layouts/Navbar.vue b/frontend/src/layouts/Navbar.vue
index 276ac081..1cf91efc 100644
--- a/frontend/src/layouts/Navbar.vue
+++ b/frontend/src/layouts/Navbar.vue
@@ -32,7 +32,7 @@ import { computed } from 'vue';
 import { useRouter } from "vue-router";
 import { useAuthStore } from "@/stores/authStore";
 import { useProjectStore } from "@/stores/projectStore";
-import { AppLogger } from "@/utils/logger";
+import { AppLogger } from "@/core/logger/logger";
 
 const logger = AppLogger.createComponentLogger('Navbar');
 
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index fc6016ed..2290d9d8 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -7,9 +7,10 @@ import './styles/underline-animation.css'
 import App from './App.vue'
 import router from './router'
 
-import {setupInterceptors} from '@/services/api/apiClient'
+import {setupInterceptors} from '@/services/apiClient'
 import {useAuthStore} from '@/stores/authStore'
-import {logger, piniaLogger, AppLogger} from '@/utils/logger'
+import {usePermissionStore} from '@/stores/permissionStore'
+import {logger, piniaLogger, AppLogger} from '@/core/logger/logger'
 import {useErrorHandler} from '@/composables/useErrorHandler'
 import {registerPermissionDirective} from '@/directives/vPermission';
 import {clickOutside} from '@/directives/clickOutside';
@@ -44,7 +45,8 @@ async function initializeApp() {
     app.directive('click-outside', clickOutside);
 
     const authStore = useAuthStore();
-    setupInterceptors(authStore);
+    const permissionStore = usePermissionStore();
+    setupInterceptors(authStore, permissionStore);
     
     // Auth will be initialized lazily by the router when needed
     // This prevents unnecessary token refresh attempts on public pages
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 18d7036c..58b753ff 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -6,7 +6,8 @@ import WorkspaceLayout from '@/layouts/WorkspaceLayout.vue';
 import DataExplorerLayout from '@/layouts/DataExplorerLayout.vue';
 import { useAuthStore } from '@/stores/authStore';
 import { usePermissionStore } from '@/stores/permissionStore';
-import { AppLogger } from '@/utils/logger';
+import { AppLogger } from '@/core/logger/logger';
+import { PUBLIC_ROUTE_NAMES, AUTH_ROUTE_NAMES } from './routes';
 
 const routes: Array<RouteRecordRaw> = [
     {
@@ -171,9 +172,6 @@ const router = createRouter({
     routes,
 });
 
-const publicRoutes = ['Login', 'Register', 'Home', 'InviteAccept', 'EmailVerification'];
-const authRoutes = ['Login', 'Register'];
-
 const logger = AppLogger.createServiceLogger('Router');
 
 // Navigation guards
@@ -181,8 +179,8 @@ router.beforeEach(async (to, from, next) => {
     const authStore = useAuthStore();
     const permissionStore = usePermissionStore();
     
-    const isPublicRoute = publicRoutes.includes(to.name as string);
-    const isAuthRoute = authRoutes.includes(to.name as string);
+    const isPublicRoute = PUBLIC_ROUTE_NAMES.includes(to.name as typeof PUBLIC_ROUTE_NAMES[number]);
+    const isAuthRoute = AUTH_ROUTE_NAMES.includes(to.name as typeof AUTH_ROUTE_NAMES[number]);
     
     // Initialize auth only when:
     // 1. Accessing a protected route, OR
diff --git a/frontend/src/constants/routes.ts b/frontend/src/router/routes.ts
similarity index 100%
rename from frontend/src/constants/routes.ts
rename to frontend/src/router/routes.ts
diff --git a/frontend/src/services/api/__tests__/apiClient.test.ts b/frontend/src/services/__tests__/apiClient.test.ts
similarity index 98%
rename from frontend/src/services/api/__tests__/apiClient.test.ts
rename to frontend/src/services/__tests__/apiClient.test.ts
index 33d1a7aa..44f8cdd8 100644
--- a/frontend/src/services/api/__tests__/apiClient.test.ts
+++ b/frontend/src/services/__tests__/apiClient.test.ts
@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, vi } from "vitest";
 import type { InternalAxiosRequestConfig } from "axios";
 
 // Mock the constants
-vi.mock("@/constants/routes", () => ({
+vi.mock("@/router/routes", () => ({
     isAuthOrPublicPath: vi.fn(),
 }));
 
@@ -19,7 +19,7 @@ vi.mock("@/config/env", () => ({
 }));
 
 // Import after mocking
-import { isAuthOrPublicPath } from "@/constants/routes";
+import { isAuthOrPublicPath } from "@/router/routes";
 
 describe("API Client Interceptor Logic", () => {
     const mockIsAuthOrPublicPath = vi.mocked(isAuthOrPublicPath);
diff --git a/frontend/src/services/api/base/index.ts b/frontend/src/services/api/base/index.ts
deleted file mode 100644
index f4b75cc2..00000000
--- a/frontend/src/services/api/base/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { BaseService } from './BaseService';
-export { BaseProjectService } from './BaseProjectService';
\ No newline at end of file
diff --git a/frontend/src/services/api/index.ts b/frontend/src/services/api/index.ts
deleted file mode 100644
index 3e89eac7..00000000
--- a/frontend/src/services/api/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Base classes
-export * from './base';
-
-// Project-related services
-export * from './projects';
-
-// User-related services
-export * from './users';
-
-
-// Auth services
-export { authService } from '../auth/authService';
-
-// Centralized service exports
-export { projectInvitationService } from './projectInvitationService';
\ No newline at end of file
diff --git a/frontend/src/services/api/projects/index.ts b/frontend/src/services/api/projects/index.ts
deleted file mode 100644
index e9c5a671..00000000
--- a/frontend/src/services/api/projects/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export { labelService } from './labelService';
-export { labelSchemeService } from './labelSchemeService';
-export { projectService } from './projectService';
-export { dataSourceService } from './dataSourceService';
-export { assetService } from './assetService';
-export { projectMemberService } from './projectMemberService';
-export { taskService } from './taskService';
-export { annotationService } from './annotationService';
-export { workflowService } from './workflowService';
-export { workflowStageService } from './workflowStageService';
-export { workflowStageAssignmentService } from './workflowStageAssignmentService';
-export { workflowStageConnectionService } from './workflowStageConnectionService';
-export { dashboardService } from './dashboardService';
\ No newline at end of file
diff --git a/frontend/src/services/api/apiClient.ts b/frontend/src/services/apiClient.ts
similarity index 73%
rename from frontend/src/services/api/apiClient.ts
rename to frontend/src/services/apiClient.ts
index fce3e042..8c4f12b1 100644
--- a/frontend/src/services/api/apiClient.ts
+++ b/frontend/src/services/apiClient.ts
@@ -2,7 +2,12 @@ import axios from 'axios';
 import type { AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import { env } from '@/config/env';
 import type { useAuthStore } from '@/stores/authStore';
-import { isAuthOrPublicPath, isAuthPath } from '@/constants/routes';
+import type { usePermissionStore } from '@/stores/permissionStore';
+import { isAuthOrPublicPath, isAuthPath } from '@/router/routes';
+import { isPermissionChangingEndpoint, getPermissionChangeDescription } from '@/core/interceptors';
+import { AppLogger } from '@/core/logger/logger';
+
+const logger = AppLogger.createServiceLogger('ApiClient');
 
 const apiClient: AxiosInstance = axios.create({
     baseURL: env.API_BASE_URL,
@@ -36,8 +41,12 @@ const processQueue = (error: Error | null, token: string | null = null) => {
  * Sets up the Axios interceptors for handling authentication and token refresh.
  * This should be called once when the application initializes.
  * @param authStore An instance of the authentication store.
+ * @param permissionStore An instance of the permission store.
  */
-export function setupInterceptors(authStore: ReturnType<typeof useAuthStore>): void {
+export function setupInterceptors(
+    authStore: ReturnType<typeof useAuthStore>,
+    permissionStore: ReturnType<typeof usePermissionStore>
+): void {
     // Request Interceptor: Add JWT token whenever available
     apiClient.interceptors.request.use(
         (config) => {
@@ -53,9 +62,29 @@ export function setupInterceptors(authStore: ReturnType<typeof useAuthStore>): v
         }
     );
 
-    // Response Interceptor: Handle token expiration and refresh logic.
+    // Response Interceptor: Handle token expiration and refresh logic, plus automatic permission refresh.
     apiClient.interceptors.response.use(
-        (response: AxiosResponse) => response,
+        async (response: AxiosResponse) => {
+            // Check if this was a successful request to a permission-changing endpoint
+            const { url, method } = response.config;
+            if (response.status >= 200 && response.status < 300 && 
+                isPermissionChangingEndpoint(url, method || 'GET')) {
+                
+                const description = getPermissionChangeDescription(url, method || 'GET');
+                logger.info(`Permission-changing request completed: ${method?.toUpperCase()} ${url} - ${description}`);
+                
+                // Automatically refresh permissions in the background
+                try {
+                    await permissionStore.refreshPermissions();
+                    logger.info('Automatically refreshed permissions after API call');
+                } catch (error) {
+                    // Don't fail the original request if permission refresh fails
+                    logger.warn('Failed to automatically refresh permissions after API call', error);
+                }
+            }
+            
+            return response;
+        },
         async (error) => {
             const originalRequest = error.config as InternalAxiosRequestConfig & { _retry?: boolean };
 
diff --git a/frontend/src/types/auth/auth.ts b/frontend/src/services/auth/auth.types.ts
similarity index 92%
rename from frontend/src/types/auth/auth.ts
rename to frontend/src/services/auth/auth.types.ts
index e9d51b17..e8981e3a 100644
--- a/frontend/src/types/auth/auth.ts
+++ b/frontend/src/services/auth/auth.types.ts
@@ -1,4 +1,8 @@
-import type { RoleEnum } from "./role";
+export enum RoleEnum {
+    ADMIN = 'ADMIN',
+    MANAGER = 'MANAGER',
+    USER = 'USER'
+}
 
 export interface LoginDto {
     email: string;
diff --git a/frontend/src/services/auth/authService.ts b/frontend/src/services/auth/authService.ts
index 408fa39e..1198654a 100644
--- a/frontend/src/services/auth/authService.ts
+++ b/frontend/src/services/auth/authService.ts
@@ -1,4 +1,4 @@
-import { BaseService } from "../api/base";
+import { BaseService } from "../base/baseService";
 import type { 
     LoginDto, 
     RegisterDto, 
@@ -9,7 +9,7 @@ import type {
     AuthTokens,
     ChangePasswordDto,
     ChangePasswordResponse
-} from "@/types/auth/auth";
+} from "@/services/auth/auth.types";
 
 /**
  * Service class for authentication operations.
diff --git a/frontend/src/services/auth/index.ts b/frontend/src/services/auth/index.ts
new file mode 100644
index 00000000..79a358ac
--- /dev/null
+++ b/frontend/src/services/auth/index.ts
@@ -0,0 +1,2 @@
+export { authService } from './authService';
+export { permissionService } from './permissionService';
\ No newline at end of file
diff --git a/frontend/src/services/api/configuration.ts b/frontend/src/services/auth/permissionService.ts
similarity index 86%
rename from frontend/src/services/api/configuration.ts
rename to frontend/src/services/auth/permissionService.ts
index ffb14eba..ff0b9f33 100644
--- a/frontend/src/services/api/configuration.ts
+++ b/frontend/src/services/auth/permissionService.ts
@@ -1,11 +1,11 @@
-import { BaseService } from './base';
-import type { UserPermissionContext } from '@/types/permissions';
+import { BaseService } from '../base/baseService';
+import type { UserPermissionContext } from './permissions.types';
 
 /**
  * Service class for managing application configuration and permissions.
  */
-class ConfigurationService extends BaseService {
-    protected readonly baseUrl = '/configuration';
+class PermissionService extends BaseService {
+    protected readonly baseUrl = '/configuration'; // TODO: Check BE and change endpoint to permission
 
     constructor() {
         super('ConfigurationService');
@@ -62,4 +62,4 @@ class ConfigurationService extends BaseService {
 }
 
 // Export singleton instance
-export const configurationService = new ConfigurationService();
+export const permissionService = new PermissionService();
diff --git a/frontend/src/types/permissions.ts b/frontend/src/services/auth/permissions.types.ts
similarity index 100%
rename from frontend/src/types/permissions.ts
rename to frontend/src/services/auth/permissions.types.ts
diff --git a/frontend/src/services/api/base/BaseService.ts b/frontend/src/services/base/baseService.ts
similarity index 96%
rename from frontend/src/services/api/base/BaseService.ts
rename to frontend/src/services/base/baseService.ts
index 6ed988f4..6e8b282d 100644
--- a/frontend/src/services/api/base/BaseService.ts
+++ b/frontend/src/services/base/baseService.ts
@@ -1,8 +1,8 @@
 import apiClient from '../apiClient';
-import { AppLogger } from '@/utils/logger';
-import { transformApiError, isValidApiResponse, isValidPaginatedResponse, isValidBlobResponse } from '@/services/utils';
-import type { PaginatedResponse } from '@/types/api/paginatedResponse';
-import type { QueryParams } from '@/types/api';
+import { AppLogger } from '@/core/logger/logger';
+import { transformApiError, isValidApiResponse, isValidPaginatedResponse, isValidBlobResponse } from '@/services/interceptors';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
+import type { QueryParams } from './requests';
 
 /**
  * Base service class providing common functionality for all API services.
diff --git a/frontend/src/types/api/error.ts b/frontend/src/services/base/error.ts
similarity index 100%
rename from frontend/src/types/api/error.ts
rename to frontend/src/services/base/error.ts
diff --git a/frontend/src/types/api/index.ts b/frontend/src/services/base/index.ts
similarity index 100%
rename from frontend/src/types/api/index.ts
rename to frontend/src/services/base/index.ts
diff --git a/frontend/src/types/api/paginatedResponse.ts b/frontend/src/services/base/paginatedResponse.ts
similarity index 100%
rename from frontend/src/types/api/paginatedResponse.ts
rename to frontend/src/services/base/paginatedResponse.ts
diff --git a/frontend/src/types/api/requests.ts b/frontend/src/services/base/requests.ts
similarity index 100%
rename from frontend/src/types/api/requests.ts
rename to frontend/src/services/base/requests.ts
diff --git a/frontend/src/services/index.ts b/frontend/src/services/index.ts
new file mode 100644
index 00000000..1ad3bef4
--- /dev/null
+++ b/frontend/src/services/index.ts
@@ -0,0 +1,5 @@
+// Auth services
+export * from './auth';
+export * from './invitation';
+export * from './project';
+export * from './user';
\ No newline at end of file
diff --git a/frontend/src/services/interceptors/__tests__/errorTransform.test.ts b/frontend/src/services/interceptors/__tests__/errorTransform.test.ts
new file mode 100644
index 00000000..f306f53d
--- /dev/null
+++ b/frontend/src/services/interceptors/__tests__/errorTransform.test.ts
@@ -0,0 +1,114 @@
+
+import { describe, it, expect } from 'vitest';
+import { transformApiError } from '../errorTransform';
+import {
+    ServerError,
+    NetworkError,
+    ValidationError,
+    ApiResponseError,
+    UnauthorizedError
+} from '@/core/errors/errors';
+import type { ApiError } from '@/services/base';
+
+describe('transformApiError', () => {
+    const context = 'TestContext';
+
+    it('should handle network errors when response is missing', () => {
+        const apiError: Partial<ApiError> = {
+            request: {},
+            message: 'Network Error'
+        };
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(NetworkError);
+        expect(error.message).toBe('Network Error');
+    });
+
+    it('should handle network errors with NETWORK_ERROR code', () => {
+        const apiError: Partial<ApiError> = {
+            code: 'NETWORK_ERROR',
+            message: 'Connection failed'
+        };
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(NetworkError);
+        expect(error.message).toBe('Connection failed');
+    });
+
+    it('should handle unauthorized errors (401)', () => {
+        const apiError: Partial<ApiError> = {
+            response: {
+                status: 401,
+                data: { message: 'Auth failed' },
+                statusText: 'Unauthorized',
+                headers: {},
+                config: { headers: {} } as any
+            }
+        };
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(UnauthorizedError);
+        expect(error.message).toBe('Auth failed');
+    });
+
+    it('should handle validation errors (400 with errors object)', () => {
+        const apiError: Partial<ApiError> = {
+            response: {
+                status: 400,
+                data: {
+                    message: 'Validation failed',
+                    errors: {
+                        field1: ['error1'],
+                        field2: ['error2']
+                    }
+                },
+                statusText: 'Bad Request',
+                headers: {},
+                config: {} as any
+            }
+        };
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(ValidationError);
+        expect(error.message).toBe('error1, error2');
+    });
+
+    it('should handle generic server errors', () => {
+        const apiError: Partial<ApiError> = {
+            response: {
+                status: 500,
+                data: { message: 'Internal Server Error' },
+                statusText: 'Internal Server Error',
+                headers: {},
+                config: {} as any
+            }
+        };
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(ServerError);
+        expect(error.message).toBe('Internal Server Error');
+        if (error instanceof ServerError) {
+            expect(error.statusCode).toBe(500);
+        }
+    });
+
+    it('should handle invalid response structure errors', () => {
+        const apiError: Partial<ApiError> = {
+            message: 'Invalid response structure'
+        };
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(ApiResponseError);
+        expect(error.message).toBe('Invalid response structure');
+    });
+
+    it('should handle unknown errors as a fallback', () => {
+        const apiError: Partial<ApiError> = {
+            message: 'An unknown error'
+        };
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(Error);
+        expect(error.message).toBe(`${context}: An unknown error`);
+    });
+
+    it('should handle unknown errors with no message', () => {
+        const apiError = {};
+        const error = transformApiError(apiError, context);
+        expect(error).toBeInstanceOf(Error);
+        expect(error.message).toBe(`${context}: Unknown error occurred`);
+    });
+});
diff --git a/frontend/src/services/utils/errorTransform.ts b/frontend/src/services/interceptors/errorTransform.ts
similarity index 96%
rename from frontend/src/services/utils/errorTransform.ts
rename to frontend/src/services/interceptors/errorTransform.ts
index 1eb95313..4a521f53 100644
--- a/frontend/src/services/utils/errorTransform.ts
+++ b/frontend/src/services/interceptors/errorTransform.ts
@@ -1,11 +1,11 @@
-import type { ApiError } from "@/types/api/error";
 import {
     ServerError,
     NetworkError,
     ValidationError,
     ApiResponseError,
     UnauthorizedError
-} from "@/types/common/errors";
+} from "@/core/errors/errors";
+import type { ApiError } from "../base";
 
 /**
  * Transforms API errors into typed error objects for consistent error handling across all services
diff --git a/frontend/src/services/utils/index.ts b/frontend/src/services/interceptors/index.ts
similarity index 100%
rename from frontend/src/services/utils/index.ts
rename to frontend/src/services/interceptors/index.ts
diff --git a/frontend/src/services/utils/responseValidation.ts b/frontend/src/services/interceptors/responseValidation.ts
similarity index 100%
rename from frontend/src/services/utils/responseValidation.ts
rename to frontend/src/services/interceptors/responseValidation.ts
diff --git a/frontend/src/services/invitation/index.ts b/frontend/src/services/invitation/index.ts
new file mode 100644
index 00000000..997f1eae
--- /dev/null
+++ b/frontend/src/services/invitation/index.ts
@@ -0,0 +1 @@
+export { invitationService } from './invitationService';
diff --git a/frontend/src/types/projectInvitation/projectInvitation.ts b/frontend/src/services/invitation/invitation.types.ts
similarity index 78%
rename from frontend/src/types/projectInvitation/projectInvitation.ts
rename to frontend/src/services/invitation/invitation.types.ts
index d5dcb447..5f2e04ea 100644
--- a/frontend/src/types/projectInvitation/projectInvitation.ts
+++ b/frontend/src/services/invitation/invitation.types.ts
@@ -1,4 +1,4 @@
-import type { ProjectRole } from '../project';
+import type { ProjectRole } from '../project/project.types';
 
 export interface ProjectInvitationDto {
     id: number;
@@ -9,4 +9,4 @@ export interface ProjectInvitationDto {
     isAccepted: boolean;
     invitedByEmail?: string;
     createdAt: string;
-}
+}
\ No newline at end of file
diff --git a/frontend/src/services/api/projectInvitationService.ts b/frontend/src/services/invitation/invitationService.ts
similarity index 89%
rename from frontend/src/services/api/projectInvitationService.ts
rename to frontend/src/services/invitation/invitationService.ts
index 02617b0a..a5711624 100644
--- a/frontend/src/services/api/projectInvitationService.ts
+++ b/frontend/src/services/invitation/invitationService.ts
@@ -1,15 +1,15 @@
-import { BaseService } from './base';
-import type { ProjectInvitationDto } from '@/types/projectInvitation';
+import { BaseService } from '../base/baseService';
+import type { ProjectInvitationDto } from './invitation.types';
 
 /**
  * Service class for managing project invitations.
  * Extends BaseService to inherit common functionality.
  */
-class ProjectInvitationService extends BaseService {
+class InvitationService extends BaseService {
     protected readonly baseUrl = '/invitations';
 
     constructor() {
-        super('ProjectInvitationService');
+        super('InvitationService');
     }
 
     /**
@@ -67,4 +67,4 @@ class ProjectInvitationService extends BaseService {
     }
 }
 
-export const projectInvitationService = new ProjectInvitationService();
\ No newline at end of file
+export const invitationService = new InvitationService();
\ No newline at end of file
diff --git a/frontend/src/services/api/projects/annotationService.ts b/frontend/src/services/project/annotationService.ts
similarity index 97%
rename from frontend/src/services/api/projects/annotationService.ts
rename to frontend/src/services/project/annotationService.ts
index 5b4d6948..c83d70b8 100644
--- a/frontend/src/services/api/projects/annotationService.ts
+++ b/frontend/src/services/project/annotationService.ts
@@ -1,12 +1,13 @@
-import { BaseProjectService } from '../base';
-import type { PaginatedResponse, QueryParams } from '@/types/api';
+import { BaseProjectService } from './baseProjectService';
+import type { QueryParams } from '@/services/base/requests';
 import { 
     type Annotation, 
     AnnotationType,
     type CreateAnnotationDto, 
     type UpdateAnnotationDto,
     type AnnotationDto
-} from '@/types/workspace/annotation';
+} from '@/core/workspace/annotation.types';
+import type { PaginatedResponse } from '../base';
 
 /**
  * Service class for managing annotations within projects.
diff --git a/frontend/src/services/api/projects/assetService.ts b/frontend/src/services/project/asset/assetService.ts
similarity index 93%
rename from frontend/src/services/api/projects/assetService.ts
rename to frontend/src/services/project/asset/assetService.ts
index c8f873ce..93a5baa8 100644
--- a/frontend/src/services/api/projects/assetService.ts
+++ b/frontend/src/services/project/asset/assetService.ts
@@ -1,11 +1,12 @@
-import { BaseProjectService } from '../base';
-import type { PaginatedResponse } from '@/types/api';
-import { buildQueryParams } from '@/types/api';
-import type { Asset, AssetListParams } from '@/types/asset';
-import type { UploadResult, BulkUploadResult } from '@/types/asset';
-import { NoFilesProvidedError } from '@/types/asset';
-import apiClient from '../apiClient';
-import { transformApiError, isValidApiResponse, isValidPaginatedResponse } from '@/services/utils';
+import { BaseProjectService } from '../baseProjectService';
+import { buildQueryParams } from '@/services/base/requests';
+import type { AssetListParams } from '@/services/project/asset';
+import type { UploadResult, BulkUploadResult } from '@/services/project/asset';
+import { NoFilesProvidedError } from '@/services/project/asset';
+import apiClient from '../../apiClient';
+import { transformApiError, isValidApiResponse, isValidPaginatedResponse } from '@/services/interceptors';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
+import type { Asset } from '@/core/asset/asset.types';
 
 /**
  * Service class for managing assets within projects.
diff --git a/frontend/src/types/asset/index.ts b/frontend/src/services/project/asset/index.ts
similarity index 72%
rename from frontend/src/types/asset/index.ts
rename to frontend/src/services/project/asset/index.ts
index a01ee796..b03bfe18 100644
--- a/frontend/src/types/asset/index.ts
+++ b/frontend/src/services/project/asset/index.ts
@@ -1,12 +1,4 @@
-// Asset types
-export type {
-    Asset,
-} from './asset';
-
-// Asset enum
-export {
-    AssetStatus,
-} from './asset';
+export { assetService } from './assetService';
 
 // Asset request types
 export type {
@@ -20,7 +12,7 @@ export type {
     BulkUploadResult,
     UploadProgress,
     ProgressCallback
-} from './uploadTypes';
+} from './upload.types';
 
 // Asset-specific upload errors
 export {
diff --git a/frontend/src/types/asset/requests.ts b/frontend/src/services/project/asset/requests.ts
similarity index 62%
rename from frontend/src/types/asset/requests.ts
rename to frontend/src/services/project/asset/requests.ts
index f2f3c30a..7848efac 100644
--- a/frontend/src/types/asset/requests.ts
+++ b/frontend/src/services/project/asset/requests.ts
@@ -1,4 +1,4 @@
-import type { QueryParams } from '../api';
+import type { QueryParams } from "@/services/base";
 
 export interface AssetListParams extends QueryParams {
     dataSourceId?: number;
diff --git a/frontend/src/types/asset/uploadTypes.ts b/frontend/src/services/project/asset/upload.types.ts
similarity index 100%
rename from frontend/src/types/asset/uploadTypes.ts
rename to frontend/src/services/project/asset/upload.types.ts
diff --git a/frontend/src/types/asset/uploadErrors.ts b/frontend/src/services/project/asset/uploadErrors.ts
similarity index 100%
rename from frontend/src/types/asset/uploadErrors.ts
rename to frontend/src/services/project/asset/uploadErrors.ts
diff --git a/frontend/src/services/api/base/BaseProjectService.ts b/frontend/src/services/project/baseProjectService.ts
similarity index 96%
rename from frontend/src/services/api/base/BaseProjectService.ts
rename to frontend/src/services/project/baseProjectService.ts
index 7d49ed3b..8ed8c061 100644
--- a/frontend/src/services/api/base/BaseProjectService.ts
+++ b/frontend/src/services/project/baseProjectService.ts
@@ -1,4 +1,4 @@
-import { BaseService } from './BaseService';
+import { BaseService } from '../base/baseService';
 
 /**
  * Base service class for project-related API services.
diff --git a/frontend/src/types/dashboard/dashboard.ts b/frontend/src/services/project/dashboard/dashboard.types.ts
similarity index 100%
rename from frontend/src/types/dashboard/dashboard.ts
rename to frontend/src/services/project/dashboard/dashboard.types.ts
diff --git a/frontend/src/services/api/projects/dashboardService.ts b/frontend/src/services/project/dashboard/dashboardService.ts
similarity index 96%
rename from frontend/src/services/api/projects/dashboardService.ts
rename to frontend/src/services/project/dashboard/dashboardService.ts
index e5797ac1..d1d00c70 100644
--- a/frontend/src/services/api/projects/dashboardService.ts
+++ b/frontend/src/services/project/dashboard/dashboardService.ts
@@ -1,4 +1,4 @@
-import { BaseProjectService } from '../base';
+import { BaseProjectService } from '../baseProjectService';
 import type { 
     DashboardAnalyticsDto,
     DashboardConfigurationDto,
@@ -6,7 +6,7 @@ import type {
     WidgetDefinitionDto,
     WidgetDataRequestDto,
     WidgetDataDto
-} from '@/types/dashboard/dashboard';
+} from '@/services/project/dashboard/dashboard.types';
 
 /**
  * Service class for managing dashboard analytics and configuration.
diff --git a/frontend/src/services/project/dashboard/index.ts b/frontend/src/services/project/dashboard/index.ts
new file mode 100644
index 00000000..66a612b4
--- /dev/null
+++ b/frontend/src/services/project/dashboard/index.ts
@@ -0,0 +1 @@
+export { dashboardService } from './dashboardService';
\ No newline at end of file
diff --git a/frontend/src/services/project/dataSource/dataSource.types.ts b/frontend/src/services/project/dataSource/dataSource.types.ts
new file mode 100644
index 00000000..b2c4fe5a
--- /dev/null
+++ b/frontend/src/services/project/dataSource/dataSource.types.ts
@@ -0,0 +1,63 @@
+import type { QueryParams } from '@/services/base/requests';
+
+export enum DataSourceType {
+    MINIO_BUCKET = 'MINIO_BUCKET',
+    S3_BUCKET = 'S3_BUCKET',
+    GSC_BUCKET = 'GSC_BUCKET',
+    AZURE_BLOB_STORAGE = 'AZURE_BLOB_STORAGE',
+    LOCAL_DIRECTORY = 'LOCAL_DIRECTORY',
+    DATABASE = 'DATABASE',
+    API = 'API',
+    OTHER = 'OTHER',
+}
+
+export enum DataSourceStatus {
+    ACTIVE = 'ACTIVE',
+    INACTIVE = 'INACTIVE',
+    SYNCING = 'SYNCING',
+    ERROR = 'ERROR',
+    ARCHIVED = 'ARCHIVED',
+}
+
+export interface DataSource {
+    id: number;
+    name: string;
+    description?: string;
+    sourceType: DataSourceType;
+    status: DataSourceStatus;
+    isDefault: boolean;
+    createdAt: string;
+    projectId: number;
+    assetCount?: number;
+}
+
+export interface CreateDataSourceRequest {
+    name: string;
+    description?: string;
+    sourceType: DataSourceType;
+    connectionDetails?: string;
+}
+
+export interface UpdateDataSourceRequest {
+    name: string;
+    description?: string;
+    status: DataSourceStatus;
+    connectionDetails?: string;
+}
+
+export interface DataSourceListParams extends QueryParams {
+    projectId?: number;
+    status?: DataSourceStatus;
+    sourceType?: DataSourceType;
+}
+
+export interface DataSourceStatsResponse {
+    totalDataSources: number;
+    activeDataSources: number;
+    totalAssets: number;
+    syncingDataSources: number;
+}
+
+export interface AvailableDataSourceTypesResponse {
+    availableTypes: DataSourceType[];
+}
\ No newline at end of file
diff --git a/frontend/src/services/api/projects/dataSourceService.ts b/frontend/src/services/project/dataSource/dataSourceService.ts
similarity index 94%
rename from frontend/src/services/api/projects/dataSourceService.ts
rename to frontend/src/services/project/dataSource/dataSourceService.ts
index d806722d..39794efe 100644
--- a/frontend/src/services/api/projects/dataSourceService.ts
+++ b/frontend/src/services/project/dataSource/dataSourceService.ts
@@ -1,13 +1,13 @@
-import { BaseProjectService } from '../base';
-import type { PaginatedResponse } from '@/types/api/paginatedResponse';
-import type { DataSource, DataSourceType } from '@/types/dataSource/dataSource';
+import { BaseProjectService } from '../baseProjectService';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
+import type { DataSource, DataSourceType } from './dataSource.types';
 import type { 
     CreateDataSourceRequest, 
     UpdateDataSourceRequest, 
     DataSourceListParams,
     DataSourceStatsResponse
-} from '@/types/dataSource/requests';
-import type { WorkflowStage } from '@/types/workflow';
+} from './dataSource.types';
+import type { WorkflowStage } from '../workflow/workflowStage.types';
 
 /**
  * Service class for managing data sources within projects.
diff --git a/frontend/src/services/project/dataSource/index.ts b/frontend/src/services/project/dataSource/index.ts
new file mode 100644
index 00000000..6d4f3815
--- /dev/null
+++ b/frontend/src/services/project/dataSource/index.ts
@@ -0,0 +1 @@
+export { dataSourceService } from './dataSourceService';
diff --git a/frontend/src/services/project/index.ts b/frontend/src/services/project/index.ts
new file mode 100644
index 00000000..411cdce3
--- /dev/null
+++ b/frontend/src/services/project/index.ts
@@ -0,0 +1,14 @@
+export { projectService } from './projectService';
+export { projectMemberService } from './projectMemberService';
+export { annotationService } from './annotationService';
+export { assetService } from './asset';
+export { dashboardService } from './dashboard';
+export { dataSourceService } from './dataSource';
+export { labelService, labelSchemeService } from './labelScheme';
+export { taskService, taskBulkOperations } from './task';
+export {
+    workflowService,
+    workflowStageService,
+    workflowStageAssignmentService,
+    workflowStageConnectionService
+} from './workflow';
\ No newline at end of file
diff --git a/frontend/src/services/api/__tests__/labelSchemeService.test.ts b/frontend/src/services/project/labelScheme/__tests__/labelSchemeService.test.ts
similarity index 96%
rename from frontend/src/services/api/__tests__/labelSchemeService.test.ts
rename to frontend/src/services/project/labelScheme/__tests__/labelSchemeService.test.ts
index 6dcc3dc1..faa73828 100644
--- a/frontend/src/services/api/__tests__/labelSchemeService.test.ts
+++ b/frontend/src/services/project/labelScheme/__tests__/labelSchemeService.test.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { labelSchemeService } from '../projects/labelSchemeService';
-import type { LabelSchemeResponse } from '@/types/label/responses';
-import type { CreateLabelSchemeRequest, UpdateLabelSchemeRequest } from '@/types/label/requests';
-import type { PaginatedResponse } from '@/types/api/paginatedResponse';
+import { labelSchemeService } from '../labelSchemeService';
+import type { LabelSchemeResponse, CreateLabelSchemeRequest, UpdateLabelSchemeRequest } from '../label.types';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
 
 // Mock the API client
 vi.mock('../apiClient', () => ({
@@ -26,7 +25,7 @@ vi.mock('@/utils/logger', () => ({
     }
 }));
 
-import apiClient from '../apiClient';
+import apiClient from '../../../apiClient';
 
 // Get references to the mocked functions
 const mockApiClient = apiClient as any;
diff --git a/frontend/src/services/api/__tests__/labelService.test.ts b/frontend/src/services/project/labelScheme/__tests__/labelService.test.ts
similarity index 97%
rename from frontend/src/services/api/__tests__/labelService.test.ts
rename to frontend/src/services/project/labelScheme/__tests__/labelService.test.ts
index 23aa6d63..6dc4e5d8 100644
--- a/frontend/src/services/api/__tests__/labelService.test.ts
+++ b/frontend/src/services/project/labelScheme/__tests__/labelService.test.ts
@@ -1,8 +1,7 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { labelService } from '../projects/labelService';
-import type { LabelResponse } from '@/types/label/responses';
-import type { CreateLabelRequest, UpdateLabelRequest } from '@/types/label/requests';
-import type { PaginatedResponse } from '@/types/api/paginatedResponse';
+import { labelService } from '../labelService';
+import type { LabelResponse, CreateLabelRequest, UpdateLabelRequest } from '../label.types';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
 
 // Mock the API client
 vi.mock('../apiClient', () => ({
@@ -26,7 +25,7 @@ vi.mock('@/utils/logger', () => ({
     }
 }));
 
-import apiClient from '../apiClient';
+import apiClient from '../../../apiClient';
 
 // Get references to the mocked functions
 const mockApiClient = apiClient as any;
diff --git a/frontend/src/services/project/labelScheme/index.ts b/frontend/src/services/project/labelScheme/index.ts
new file mode 100644
index 00000000..f6d9b978
--- /dev/null
+++ b/frontend/src/services/project/labelScheme/index.ts
@@ -0,0 +1,2 @@
+export { labelService } from './labelService';
+export { labelSchemeService } from './labelSchemeService';
diff --git a/frontend/src/services/project/labelScheme/label.types.ts b/frontend/src/services/project/labelScheme/label.types.ts
new file mode 100644
index 00000000..e38d514d
--- /dev/null
+++ b/frontend/src/services/project/labelScheme/label.types.ts
@@ -0,0 +1,93 @@
+export interface Label {
+    labelId: number;
+    name: string;
+    color: string;
+    description?: string;
+    labelSchemeId: number;
+    createdAt: string;
+}
+
+export interface LabelScheme {
+    labelSchemeId: number;
+    name: string;
+    description?: string;
+    projectId: number;
+    isDefault?: boolean;
+    isActive: boolean;
+    createdAt: string;
+    deletedAt?: string;
+    labels?: Label[];
+}
+
+export interface FormPayloadLabelScheme {
+    name: string;
+    description?: string;
+    labels?: {
+        name: string;
+        color: string;
+        description?: string;
+    }[];
+}
+
+export interface LabelSchemeDeletionImpact {
+    labelSchemeId: number;
+    labelSchemeName: string;
+    totalLabelsCount: number;
+    totalAnnotationsCount: number;
+    labelImpacts: LabelImpact[];
+}
+
+export interface LabelImpact {
+    labelId: number;
+    labelName: string;
+    labelColor?: string;
+    annotationsCount: number;
+}
+
+export interface CreateLabelSchemeRequest {
+    name: string;
+    description?: string;
+    labels?: Omit<Label, 'labelId' | 'labelSchemeId'>[];
+}
+
+export interface UpdateLabelSchemeRequest {
+    name?: string;
+    description?: string;
+}
+
+export interface CreateLabelRequest {
+    name: string;
+    color: string;
+    description?: string;
+    metadata?: any;
+}
+
+export interface UpdateLabelRequest {
+    name?: string;
+    color?: string;
+    description?: string;
+    metadata?: any;
+}
+
+export interface LabelSchemeResponse {
+    id: number;
+    name: string;
+    description?: string;
+    projectId: number;
+    isDefault: boolean;
+    isActive: boolean;
+    createdAt: string;
+    deletedAt?: string;
+    labels: LabelResponse[];
+}
+
+export interface LabelResponse {
+    id: number;
+    name: string;
+    color: string;
+    description?: string;
+    labelSchemeId: number;
+    metadata?: any;
+    createdAt: string;
+    updatedAt: string;
+}
\ No newline at end of file
diff --git a/frontend/src/services/api/projects/labelSchemeService.ts b/frontend/src/services/project/labelScheme/labelSchemeService.ts
similarity index 93%
rename from frontend/src/services/api/projects/labelSchemeService.ts
rename to frontend/src/services/project/labelScheme/labelSchemeService.ts
index c2d00631..30d27ec6 100644
--- a/frontend/src/services/api/projects/labelSchemeService.ts
+++ b/frontend/src/services/project/labelScheme/labelSchemeService.ts
@@ -2,15 +2,16 @@
  * Label Scheme Service - Handles API operations for label schemes
  */
 
-import { BaseProjectService } from '../base';
-import type { LabelSchemeResponse } from '@/types/label/responses';
-import type {
+import { BaseProjectService } from '../baseProjectService';
+import type { 
+    LabelSchemeResponse,
     CreateLabelSchemeRequest,
-    UpdateLabelSchemeRequest
-} from '@/types/label/requests';
-import type { LabelScheme, LabelSchemeDeletionImpact } from '@/types/label/labelScheme';
-import type { PaginatedResponse } from '@/types/api/paginatedResponse';
-import type { QueryParams } from '@/types/api';
+    UpdateLabelSchemeRequest,
+    LabelScheme, 
+    LabelSchemeDeletionImpact 
+} from './label.types';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
+import type { QueryParams } from '@/services/base/requests';
 
 /**
  * Transforms a backend LabelSchemeResponse object to a frontend LabelScheme object.
diff --git a/frontend/src/services/api/projects/labelService.ts b/frontend/src/services/project/labelScheme/labelService.ts
similarity index 93%
rename from frontend/src/services/api/projects/labelService.ts
rename to frontend/src/services/project/labelScheme/labelService.ts
index 50e4d6e0..f6817420 100644
--- a/frontend/src/services/api/projects/labelService.ts
+++ b/frontend/src/services/project/labelScheme/labelService.ts
@@ -2,15 +2,15 @@
  * Label Service - Handles API operations for labels within label schemes
  */
 
-import { BaseProjectService } from '../base';
-import type { LabelResponse } from '@/types/label/responses';
-import type {
+import { BaseProjectService } from '../baseProjectService';
+import type { 
+    LabelResponse,
     CreateLabelRequest,
     UpdateLabelRequest,
-} from '@/types/label/requests';
-import type { Label } from '@/types/label/label';
-import type { PaginatedResponse } from '@/types/api/paginatedResponse';
-import type { QueryParams } from '@/types/api';
+    Label 
+} from './label.types';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
+import type { QueryParams } from '@/services/base/requests';
 
 /**
  * Transforms a backend LabelResponse object to a frontend Label object.
diff --git a/frontend/src/types/project/project.ts b/frontend/src/services/project/project.types.ts
similarity index 65%
rename from frontend/src/types/project/project.ts
rename to frontend/src/services/project/project.types.ts
index 8fb6b999..b54162a9 100644
--- a/frontend/src/types/project/project.ts
+++ b/frontend/src/services/project/project.types.ts
@@ -34,3 +34,24 @@ export interface Project {
     ownerEmail?: string;
     annotationGuidelinesUrl?: string;
 }
+
+export interface CreateProjectRequest {
+    name: string;
+    description?: string;
+    projectType: ProjectType;
+}
+
+export interface UpdateProjectRequest {
+    name: string;
+    description?: string;
+    status: ProjectStatus;
+    annotationGuidelinesUrl?: string;
+}
+
+export interface ProjectStatsResponse {
+    totalAssets: number;
+    annotatedAssets: number;
+    totalAnnotations: number;
+    activeAnnotators: number;
+    completionPercentage: number;
+}
\ No newline at end of file
diff --git a/frontend/src/types/projectMember/projectMember.ts b/frontend/src/services/project/projectMember.types.ts
similarity index 85%
rename from frontend/src/types/projectMember/projectMember.ts
rename to frontend/src/services/project/projectMember.types.ts
index 3d0c9804..b6533b1c 100644
--- a/frontend/src/types/projectMember/projectMember.ts
+++ b/frontend/src/services/project/projectMember.types.ts
@@ -1,4 +1,4 @@
-import type { ProjectRole } from "../project"
+import type { ProjectRole } from "./project.types";
 
 export interface ProjectMember {
     id: number;
diff --git a/frontend/src/services/api/projects/projectMemberService.ts b/frontend/src/services/project/projectMemberService.ts
similarity index 94%
rename from frontend/src/services/api/projects/projectMemberService.ts
rename to frontend/src/services/project/projectMemberService.ts
index 5a09d02a..9b8d5205 100644
--- a/frontend/src/services/api/projects/projectMemberService.ts
+++ b/frontend/src/services/project/projectMemberService.ts
@@ -1,6 +1,6 @@
-import { BaseProjectService } from '../base';
-import type { ProjectRole } from '@/types/project';
-import type { ProjectMember, InviteMemberRequest } from '@/types/projectMember';
+import { BaseProjectService } from './baseProjectService';
+import type { ProjectRole } from './project.types';
+import type { ProjectMember, InviteMemberRequest } from '@/services/project/projectMember.types';
 
 /**
  * Service class for managing project members.
diff --git a/frontend/src/services/api/projects/projectService.ts b/frontend/src/services/project/projectService.ts
similarity index 95%
rename from frontend/src/services/api/projects/projectService.ts
rename to frontend/src/services/project/projectService.ts
index 6f916369..fa3fcbfb 100644
--- a/frontend/src/services/api/projects/projectService.ts
+++ b/frontend/src/services/project/projectService.ts
@@ -1,12 +1,12 @@
-import { BaseService } from '../base';
-import type { PaginatedResponse } from '@/types/api/paginatedResponse';
-import type { Project } from '@/types/project/project';
+import { BaseService } from '../base/baseService';
+import type { PaginatedResponse } from '@/services/base/paginatedResponse';
+import type { Project } from './project.types';
 import type { 
     CreateProjectRequest, 
     UpdateProjectRequest,
     ProjectStatsResponse
-} from '@/types/project/requests';
-import type { QueryParams } from '@/types/api';
+} from './project.types';
+import type { QueryParams } from '@/services/base/requests';
 
 /**
  * Service class for managing projects.
diff --git a/frontend/src/services/project/task/index.ts b/frontend/src/services/project/task/index.ts
new file mode 100644
index 00000000..6f54131c
--- /dev/null
+++ b/frontend/src/services/project/task/index.ts
@@ -0,0 +1,2 @@
+export { taskService } from './taskService';
+export { taskBulkOperations } from './taskBulkOperationsService';
\ No newline at end of file
diff --git a/frontend/src/types/task/task.ts b/frontend/src/services/project/task/task.types.ts
similarity index 99%
rename from frontend/src/types/task/task.ts
rename to frontend/src/services/project/task/task.types.ts
index 3c3d3b19..b4bf0794 100644
--- a/frontend/src/types/task/task.ts
+++ b/frontend/src/services/project/task/task.types.ts
@@ -136,4 +136,4 @@ export interface PipelineResultDto {
     errorMessage?: string;
     updatedTask?: Task;
     details?: string;
-}
+}
\ No newline at end of file
diff --git a/frontend/src/services/taskBulkOperations.ts b/frontend/src/services/project/task/taskBulkOperationsService.ts
similarity index 97%
rename from frontend/src/services/taskBulkOperations.ts
rename to frontend/src/services/project/task/taskBulkOperationsService.ts
index a9adef6f..eac2df4c 100644
--- a/frontend/src/services/taskBulkOperations.ts
+++ b/frontend/src/services/project/task/taskBulkOperationsService.ts
@@ -1,4 +1,4 @@
-import { taskService } from './api/projects';
+import { taskService } from './taskService';
 import type {
     TaskBulkOperationsService,
     BulkOperationResult,
@@ -7,8 +7,10 @@ import type {
     BulkAssignmentRequest,
     BulkArchiveRequest,
     BulkOperationError
-} from '@/types/task';
-import { AppLogger } from '@/utils/logger';
+} from './taskSelection.types';
+import { AppLogger } from '@/core/logger/logger';
+
+// TODO: This is not a service. Move to core
 
 /**
  * Service for performing bulk operations on tasks
diff --git a/frontend/src/types/task/selection.ts b/frontend/src/services/project/task/taskSelection.types.ts
similarity index 99%
rename from frontend/src/types/task/selection.ts
rename to frontend/src/services/project/task/taskSelection.types.ts
index e1721f09..9be2b96e 100644
--- a/frontend/src/types/task/selection.ts
+++ b/frontend/src/services/project/task/taskSelection.types.ts
@@ -1,5 +1,5 @@
 import type { ComputedRef } from 'vue';
-import type { TaskTableRow } from './task';
+import type { TaskTableRow } from './task.types';
 
 /**
  * Represents the result of a bulk operation on tasks
diff --git a/frontend/src/services/api/projects/taskService.ts b/frontend/src/services/project/task/taskService.ts
similarity index 97%
rename from frontend/src/services/api/projects/taskService.ts
rename to frontend/src/services/project/task/taskService.ts
index c90ddf20..38d208fe 100644
--- a/frontend/src/services/api/projects/taskService.ts
+++ b/frontend/src/services/project/task/taskService.ts
@@ -1,20 +1,11 @@
-import { BaseProjectService } from '../base';
+import { BaseProjectService } from '../baseProjectService';
 import type { 
-    Task, 
-    TaskWithDetails, 
-    CreateTaskRequest, 
-    UpdateTaskRequest,
-    TaskTableRow,
     TasksQueryParams,
     GetTasksResponse,
-    ChangeTaskStatusDto,
-    CompleteTaskDto,
-    VetoTaskDto,
-    PipelineResultDto
-} from '@/types/task';
-import { TaskStatus } from '@/types/task';
-import { workflowStageService } from './workflowStageService';
-import { assetService } from './assetService';
+} from './taskService.types';
+import { TaskStatus, type ChangeTaskStatusDto, type CompleteTaskDto, type CreateTaskRequest, type PipelineResultDto, type Task, type TaskTableRow, type TaskWithDetails, type UpdateTaskRequest, type VetoTaskDto } from './task.types';
+import { workflowStageService } from '../workflow/workflowStageService';
+import { assetService } from '../asset/assetService';
 
 /**
  * Service class for managing tasks within projects.
diff --git a/frontend/src/types/task/taskService.ts b/frontend/src/services/project/task/taskService.types.ts
similarity index 80%
rename from frontend/src/types/task/taskService.ts
rename to frontend/src/services/project/task/taskService.types.ts
index cc4b0094..63ef3368 100644
--- a/frontend/src/types/task/taskService.ts
+++ b/frontend/src/services/project/task/taskService.types.ts
@@ -1,6 +1,5 @@
-import type { QueryParams } from '@/types/api';
-import type { Task } from '@/types/task';
-import { TaskStatus } from '@/types/task';
+import type { QueryParams } from '@/services/base/requests';
+import type { Task, TaskStatus } from './task.types';
 
 export interface TaskFilters {
     workflowStageId?: number;
diff --git a/frontend/src/services/project/workflow/index.ts b/frontend/src/services/project/workflow/index.ts
new file mode 100644
index 00000000..7e1d20e5
--- /dev/null
+++ b/frontend/src/services/project/workflow/index.ts
@@ -0,0 +1,4 @@
+export { workflowService } from './workflowService';
+export { workflowStageService } from './workflowStageService';
+export { workflowStageAssignmentService } from './workflowStageAssignmentService';
+export { workflowStageConnectionService } from './workflowStageConnectionService';
diff --git a/frontend/src/types/workflow/workflow.ts b/frontend/src/services/project/workflow/workflow.types.ts
similarity index 98%
rename from frontend/src/types/workflow/workflow.ts
rename to frontend/src/services/project/workflow/workflow.types.ts
index 856fd324..cf6e6759 100644
--- a/frontend/src/types/workflow/workflow.ts
+++ b/frontend/src/services/project/workflow/workflow.types.ts
@@ -1,4 +1,4 @@
-import type { WorkflowStage, WorkflowStageType } from "./workflowstage";
+import type { WorkflowStage, WorkflowStageType } from "./workflowStage.types";
 
 export interface Workflow {
     id: number;
@@ -44,4 +44,4 @@ export interface CreateWorkflowStageWithAssignmentsRequest {
     inputDataSourceId?: number;
     targetDataSourceId?: number;
     assignedProjectMemberIds: number[];
-}
+}
\ No newline at end of file
diff --git a/frontend/src/services/api/projects/workflowService.ts b/frontend/src/services/project/workflow/workflowService.ts
similarity index 93%
rename from frontend/src/services/api/projects/workflowService.ts
rename to frontend/src/services/project/workflow/workflowService.ts
index 7cf5e65d..50d6482b 100644
--- a/frontend/src/services/api/projects/workflowService.ts
+++ b/frontend/src/services/project/workflow/workflowService.ts
@@ -1,12 +1,12 @@
-import { BaseProjectService } from '../base';
-import type { PaginatedResponse } from "@/types/api/paginatedResponse";
+import { BaseProjectService } from '../baseProjectService';
+import type { PaginatedResponse } from "@/services/base/paginatedResponse";
 import type {
     Workflow,
     CreateWorkflowRequest,
     UpdateWorkflowRequest,
     CreateWorkflowWithStagesRequest
-} from "@/types/workflow";
-import type { QueryParams } from '@/types/api';
+} from "./workflow.types";
+import type { QueryParams } from '@/services/base/requests';
 
 /**
  * Service class for managing workflows within projects.
diff --git a/frontend/src/types/workflow/workflowstage.ts b/frontend/src/services/project/workflow/workflowStage.types.ts
similarity index 97%
rename from frontend/src/types/workflow/workflowstage.ts
rename to frontend/src/services/project/workflow/workflowStage.types.ts
index 63c4a4e7..45727531 100644
--- a/frontend/src/types/workflow/workflowstage.ts
+++ b/frontend/src/services/project/workflow/workflowStage.types.ts
@@ -1,4 +1,4 @@
-import type { ProjectMember } from "../projectMember";
+import type { ProjectMember } from "@/services/project/projectMember.types";
 
 export enum WorkflowStageType {
     ANNOTATION = "ANNOTATION",
diff --git a/frontend/src/services/api/projects/workflowStageAssignmentService.ts b/frontend/src/services/project/workflow/workflowStageAssignmentService.ts
similarity index 97%
rename from frontend/src/services/api/projects/workflowStageAssignmentService.ts
rename to frontend/src/services/project/workflow/workflowStageAssignmentService.ts
index 1c8f8299..5860709f 100644
--- a/frontend/src/services/api/projects/workflowStageAssignmentService.ts
+++ b/frontend/src/services/project/workflow/workflowStageAssignmentService.ts
@@ -1,5 +1,5 @@
-import { BaseProjectService } from '../base';
-import type {WorkflowStageAssignment, CreateWorkflowStageAssignmentRequest} from '@/types/workflow';
+import { BaseProjectService } from '../baseProjectService';
+import type {WorkflowStageAssignment, CreateWorkflowStageAssignmentRequest} from './workflowStage.types';
 
 /**
  * Service class for managing workflow stage assignments within projects.
diff --git a/frontend/src/services/api/projects/workflowStageConnectionService.ts b/frontend/src/services/project/workflow/workflowStageConnectionService.ts
similarity index 97%
rename from frontend/src/services/api/projects/workflowStageConnectionService.ts
rename to frontend/src/services/project/workflow/workflowStageConnectionService.ts
index 164c7df5..bd918e40 100644
--- a/frontend/src/services/api/projects/workflowStageConnectionService.ts
+++ b/frontend/src/services/project/workflow/workflowStageConnectionService.ts
@@ -1,9 +1,9 @@
-import { BaseProjectService } from '../base';
+import { BaseProjectService } from '../baseProjectService';
 import type {
     WorkflowStageConnection,
     CreateWorkflowStageConnectionRequest,
     UpdateWorkflowStageConnectionRequest
-} from "@/types/workflow";
+} from "./workflowStage.types";
 
 /**
  * Service class for managing workflow stage connections within projects.
diff --git a/frontend/src/services/api/projects/workflowStageService.ts b/frontend/src/services/project/workflow/workflowStageService.ts
similarity index 96%
rename from frontend/src/services/api/projects/workflowStageService.ts
rename to frontend/src/services/project/workflow/workflowStageService.ts
index d9145ed0..e5e0d5c3 100644
--- a/frontend/src/services/api/projects/workflowStageService.ts
+++ b/frontend/src/services/project/workflow/workflowStageService.ts
@@ -1,13 +1,13 @@
-import { BaseProjectService } from '../base';
-import type { PaginatedResponse } from "@/types/api/paginatedResponse";
+import { BaseProjectService } from '../baseProjectService';
+import type { PaginatedResponse } from "@/services/base/paginatedResponse";
 import type {
     WorkflowStage,
     CreateWorkflowStageRequest,
     UpdateWorkflowStageRequest,
-    WorkflowWithStages
-} from "@/types/workflow";
-import type { QueryParams } from '@/types/api';
+} from "./workflowStage.types";
+import type { QueryParams } from '@/services/base/requests';
 import { workflowService } from './workflowService';
+import type { WorkflowWithStages } from './workflow.types';
 
 /**
  * Service class for managing workflow stages within projects.
diff --git a/frontend/src/services/api/users/index.ts b/frontend/src/services/user/index.ts
similarity index 100%
rename from frontend/src/services/api/users/index.ts
rename to frontend/src/services/user/index.ts
diff --git a/frontend/src/services/api/users/userService.ts b/frontend/src/services/user/userService.ts
similarity index 91%
rename from frontend/src/services/api/users/userService.ts
rename to frontend/src/services/user/userService.ts
index ef35d48e..01e62857 100644
--- a/frontend/src/services/api/users/userService.ts
+++ b/frontend/src/services/user/userService.ts
@@ -1,5 +1,5 @@
-import { BaseService } from '../base';
-import type { UserDto } from '@/types/auth/auth';
+import { BaseService } from '../base/baseService';
+import type { UserDto } from '@/services/auth/auth.types';
 
 /**
  * Service class for managing user-related operations.
diff --git a/frontend/src/stores/__tests__/authStore.test.ts b/frontend/src/stores/__tests__/authStore.test.ts
index 883c11cb..1625dda4 100644
--- a/frontend/src/stores/__tests__/authStore.test.ts
+++ b/frontend/src/stores/__tests__/authStore.test.ts
@@ -1,8 +1,6 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from "vitest";
 import { setActivePinia, createPinia } from "pinia";
 import { useAuthStore } from "../authStore";
-import type { AuthTokens, UserDto, LoginDto } from "@/types/auth/auth.ts"
-import { RoleEnum } from "@/types/auth/role";
 
 vi.mock("@/services/auth/authService", () => ({
     authService: {
@@ -14,6 +12,7 @@ vi.mock("@/services/auth/authService", () => ({
 }));
 
 import { authService } from "@/services/auth/authService.ts";
+import { RoleEnum, type AuthTokens, type LoginDto, type UserDto } from "@/services/auth/auth.types";
 
 describe("Auth Store", () => {
     let authStore: ReturnType<typeof useAuthStore>;
diff --git a/frontend/src/stores/__tests__/workspaceStore.test.ts b/frontend/src/stores/__tests__/workspaceStore.test.ts
index 1b8396b1..d819b26f 100644
--- a/frontend/src/stores/__tests__/workspaceStore.test.ts
+++ b/frontend/src/stores/__tests__/workspaceStore.test.ts
@@ -1,16 +1,16 @@
 import { describe, it, expect, beforeEach, vi, afterEach } from "vitest";
 import { setActivePinia, createPinia } from "pinia";
 import { useWorkspaceStore } from "../workspaceStore";
-import { ToolName } from "@/types/workspace/tools";
-import type { ImageDimensions } from "@/types/image/imageDimensions";
-import type { Point } from "@/types/common/point";
-import type { Annotation } from "@/types/workspace/annotation";
-import { AnnotationType } from "@/types/workspace/annotation";
-import type { LabelScheme } from "@/types/label/labelScheme";
-import { AssetStatus } from "@/types/asset/asset";
+import { ToolName, type Tool } from "@/core/workspace/tools.types";
+import type { ImageDimensions } from "@/core/asset/asset.types";
+import type { Point } from "@/core/geometry/geometry.types";
+import type { Annotation } from "@/core/workspace/annotation.types";
+import { AnnotationType } from "@/core/workspace/annotation.types";
+import type { LabelScheme } from "@/services/project/labelScheme/label.types";
+import { AssetStatus } from '@/core/asset/asset.types';
 
 // Mock the services from projects
-vi.mock("@/services/api/projects", () => ({
+vi.mock("@/services/projects", () => ({
     annotationService: {
         getAnnotationsForAsset: vi.fn(),
         createAnnotation: vi.fn(),
@@ -41,7 +41,7 @@ import {
     annotationService,
     assetService, 
     labelSchemeService 
-} from "@/services/api/projects";
+} from "@/services/project";
 
 // Mock the timer utility
 vi.mock("@/utils/timer", () => ({
@@ -164,7 +164,7 @@ describe("Workspace Store", () => {
         it("should have default available tools", () => {
             expect(workspaceStore.availableTools).toHaveLength(6);
             expect(
-                workspaceStore.availableTools.map((tool) => tool.id)
+                workspaceStore.availableTools.map((tool: Tool) => tool.id)
             ).toEqual([
                 ToolName.CURSOR,
                 ToolName.POINT,
@@ -293,7 +293,7 @@ describe("Workspace Store", () => {
             });
 
             // Mock task service
-            const { taskService } = await import("@/services/api/projects");
+            const { taskService } = await import("@/services/project");
             vi.mocked(taskService.getTasksForAsset).mockResolvedValue([]);
 
             await workspaceStore.loadAsset("1", "1");
@@ -301,7 +301,7 @@ describe("Workspace Store", () => {
             expect(workspaceStore.currentProjectId).toBe("1");
             expect(workspaceStore.currentAssetId).toBe("1");
             expect(workspaceStore.currentImageUrl).toBe("https://picsum.photos/800/600?random=123");
-            expect(workspaceStore.imageNaturalDimensions).toBeNull();
+            expect(workspaceStore.imageNaturalDimensions).toEqual({ width: 800, height: 600 });
             expect(workspaceStore.annotations).toEqual([mockAnnotation]);
             expect(workspaceStore.currentLabelId).toBeNull();
             expect(workspaceStore.activeTool).toBe(ToolName.CURSOR);
diff --git a/frontend/src/stores/authStore.ts b/frontend/src/stores/authStore.ts
index f3ecc509..c2e983c2 100644
--- a/frontend/src/stores/authStore.ts
+++ b/frontend/src/stores/authStore.ts
@@ -1,17 +1,12 @@
 import { defineStore } from "pinia";
-import type {
-    AuthTokens,
-    LoginDto,
-    RegisterDto,
-    UserDto,
-} from "@/types/auth/auth";
+
 import { authService } from "@/services/auth/authService";
 import { env } from "@/config/env";
-import { RoleEnum } from "@/types/auth/role";
-import { AppLogger } from "@/utils/logger";
-import { LastProjectManager } from "@/core/storage";
+import { AppLogger } from "@/core/logger/logger";
+import { LastProjectManager } from "@/core/persistence";
 import { usePermissionStore } from "./permissionStore";
-import { isUnauthorizedError } from "@/types/common/errors";
+import { isUnauthorizedError } from "@/core/errors/errors";
+import type { AuthTokens, LoginDto, RegisterDto, RoleEnum, UserDto } from "@/services/auth/auth.types";
 
 const logger = AppLogger.createStoreLogger('AuthStore');
 
diff --git a/frontend/src/stores/dashboardStore.ts b/frontend/src/stores/dashboardStore.ts
index 57e86552..3fb63173 100644
--- a/frontend/src/stores/dashboardStore.ts
+++ b/frontend/src/stores/dashboardStore.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { dashboardService } from "@/services/api/projects/dashboardService";
+import { dashboardService } from "@/services/project";
 import type { 
     DashboardState, 
     DashboardLayoutDto,
@@ -7,9 +7,9 @@ import type {
     WidgetInstanceDto,
     WidgetDataRequestDto,
     WidgetDataDto
-} from "@/types/dashboard/dashboard";
+} from "@/services/project/dashboard/dashboard.types";
 import { useErrorHandler } from "@/composables/useErrorHandler";
-import { AppLogger } from "@/utils/logger";
+import { AppLogger } from "@/core/logger/logger";
 import { useProjectStore } from "@/stores/projectStore";
 
 const logger = AppLogger.createServiceLogger("DashboardStore");
diff --git a/frontend/src/stores/permissionStore.ts b/frontend/src/stores/permissionStore.ts
index cbafe354..213def28 100644
--- a/frontend/src/stores/permissionStore.ts
+++ b/frontend/src/stores/permissionStore.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
-import { configurationService } from "@/services/api/configuration";
-import type { UserPermissionContext } from "@/types/permissions";
-import { AppLogger } from "@/utils/logger";
+import { permissionService } from "@/services/auth";
+import type { UserPermissionContext } from "@/services/auth/permissions.types";
+import { AppLogger } from "@/core/logger/logger";
 
 const logger = AppLogger.createStoreLogger('PermissionStore');
 
@@ -129,7 +129,7 @@ export const usePermissionStore = defineStore("permissions", {
             
             try {
                 logger.info("Loading user permission context");
-                this.userContext = await configurationService.getUserPermissionContext();
+                this.userContext = await permissionService.getUserPermissionContext();
                 this.isInitialized = true;
                 
                 const permissionCount = this.userContext.permissions.length;
@@ -151,7 +151,7 @@ export const usePermissionStore = defineStore("permissions", {
         async getPagePermissions(page: string, projectId?: number): Promise<string[]> {
             try {
                 logger.debug(`Getting page permissions for: ${page}${projectId ? ` (project: ${projectId})` : ''}`);
-                return await configurationService.getPagePermissions(page, projectId);
+                return await permissionService.getPagePermissions(page, projectId);
             } catch (error) {
                 logger.error(`Failed to get page permissions for ${page}`, error);
                 return [];
@@ -181,7 +181,7 @@ export const usePermissionStore = defineStore("permissions", {
          */
         async reloadConfiguration(): Promise<void> {
             try {
-                await configurationService.reloadPermissionConfiguration();
+                await permissionService.reloadPermissionConfiguration();
                 // Refresh user permissions after configuration reload
                 await this.refreshPermissions();
                 logger.info("Permission configuration reloaded successfully");
diff --git a/frontend/src/stores/projectStore.ts b/frontend/src/stores/projectStore.ts
index 7a7ef7f3..3ef92fb4 100644
--- a/frontend/src/stores/projectStore.ts
+++ b/frontend/src/stores/projectStore.ts
@@ -1,15 +1,15 @@
 import { defineStore } from "pinia";
-import { projectService, projectMemberService } from "@/services/api/projects";
-import type { Project } from "@/types/project/project";
-import type { ProjectMember } from "@/types/projectMember/projectMember";
-import type { Label } from "@/types/label/label";
-import type { ProjectRole } from "@/types/project/project";
+import { projectService, projectMemberService } from "@/services/project";
+import type { Project } from "@/services/project/project.types";
+import type { ProjectMember } from "@/services/project/projectMember.types";
+import type { Label } from "@/services/project/labelScheme/label.types";
+import type { ProjectRole } from "@/services/project/project.types";
 import { useErrorHandler } from "@/composables/useErrorHandler";
-import { AppLogger } from "@/utils/logger";
-import { LastProjectManager, LastStageManager } from "@/core/storage";
-import type { LastStageData } from "@/types/storage";
+import { AppLogger } from "@/core/logger/logger";
+import { LastProjectManager, LastStageManager } from "@/core/persistence";
 import { useAuthStore } from "@/stores/authStore";
-import type { ProjectState } from "@/types/stores/projectStore";
+import type { ProjectState } from "./projectStore.types";
+import type { LastStageData } from "@/core/persistence/lastProject.types";
 
 const logger = AppLogger.createServiceLogger("ProjectStore");
 
diff --git a/frontend/src/types/stores/projectStore.ts b/frontend/src/stores/projectStore.types.ts
similarity index 52%
rename from frontend/src/types/stores/projectStore.ts
rename to frontend/src/stores/projectStore.types.ts
index 198a78a6..6f4cdf3d 100644
--- a/frontend/src/types/stores/projectStore.ts
+++ b/frontend/src/stores/projectStore.types.ts
@@ -1,6 +1,6 @@
-import type { Project } from "@/types/project/project";
-import type { ProjectMember } from "@/types/projectMember/projectMember";
-import type { Label } from "@/types/label/label";
+import type { Project } from "@/services/project/project.types";
+import type { ProjectMember } from "@/services/project/projectMember.types";
+import type { Label } from "@/services/project/labelScheme/label.types";
 
 export interface ProjectState {
     currentProject: Project | null;
diff --git a/frontend/src/stores/workspaceStore.ts b/frontend/src/stores/workspaceStore.ts
index 3b5acc86..80ba1e0e 100644
--- a/frontend/src/stores/workspaceStore.ts
+++ b/frontend/src/stores/workspaceStore.ts
@@ -1,27 +1,26 @@
 import { defineStore } from "pinia";
 import { faArrowPointer, faDotCircle, faMinus, faWaveSquare, faSquare, faDrawPolygon } from '@fortawesome/free-solid-svg-icons';
-import type { ImageDimensions } from "@/types/image/imageDimensions";
-import type { WorkspaceState } from "@/types/workspace/workspaceState";
-import { Timer } from "@/utils/timer";
-import type { Point } from "@/types/common/point";
-import { ToolName, type Tool } from "@/types/workspace/tools";
-import type { Annotation, CreateAnnotationDto } from '@/types/workspace/annotation';
-import type { LabelScheme } from '@/types/label/labelScheme';
-import type { Label } from '@/types/label/label';
+import type { ImageDimensions } from "@/core/asset/asset.types";
+import type { WorkspaceState } from "./workspaceStore.types";
+import { Timer } from "@/core/timing";
+import type { Point } from "@/core/geometry/geometry.types";
+import { ToolName, type Tool } from "@/core/workspace/tools.types";
+import type { Annotation, CreateAnnotationDto } from '@/core/workspace/annotation.types';
+import type { LabelScheme, Label } from '@/services/project/labelScheme/label.types';
+import { AssetManager, TaskManager, TaskNavigationManager } from '@/core/workspace';
 import { 
     annotationService,
-    assetService, 
     labelSchemeService,
     labelService,
     taskService,
     workflowService,
     workflowStageService
-} from '@/services/api/projects';
-import type { Asset } from '@/types/asset/asset';
-import type { Task } from '@/types/task';
-import { TaskStatus } from '@/types/task';
-import { AppLogger } from '@/utils/logger';
-import { WorkflowStageType } from '@/types/workflow/workflowstage';
+} from '@/services/project';
+import type { Asset } from '@/core/asset/asset.types';
+import type { Task } from '@/services/project/task/task.types';
+import { TaskStatus } from '@/services/project/task/task.types';
+import { AppLogger } from '@/core/logger/logger';
+import { WorkflowStageType } from '@/services/project/workflow/workflowStage.types';
 
 const logger = AppLogger.createServiceLogger('WorkspaceStore');
 
@@ -29,6 +28,9 @@ const MIN_ZOOM = 0.1;
 const MAX_ZOOM = 10.0;
 const ZOOM_SENSITIVITY = 0.005;
 
+// Core managers
+const assetManager = new AssetManager();
+
 // TODO: Refactor the store
 
 export const useWorkspaceStore = defineStore("workspace", {
@@ -83,7 +85,7 @@ export const useWorkspaceStore = defineStore("workspace", {
             zoomSensitivity: ZOOM_SENSITIVITY,
         }),
         getActiveToolDetails(): Tool | undefined {
-            return this.availableTools.find(tool => tool.id === this.activeTool);
+            return this.availableTools.find((tool: Tool) => tool.id === this.activeTool);
         },
         getAnnotations(state): Annotation[] {
             return state.annotations;
@@ -99,7 +101,7 @@ export const useWorkspaceStore = defineStore("workspace", {
                 if (!state.currentLabelScheme || !state.currentLabelScheme.labels) {
                     return undefined;
                 }
-                return state.currentLabelScheme.labels.find(label => label.labelId === labelId);
+                return state.currentLabelScheme.labels.find((label: Label) => label.labelId === labelId);
             };
         },
         getCurrentAsset(state): Asset | null {
@@ -127,12 +129,12 @@ export const useWorkspaceStore = defineStore("workspace", {
             if (!state.currentTaskData || state.availableTasks.length === 0) {
                 return -1;
             }
-            return state.availableTasks.findIndex(task => task.id === state.currentTaskData?.id);
+            return state.availableTasks.findIndex((task: Task) => task.id === state.currentTaskData?.id);
         },
         getTaskNavigationInfo(state): { current: number; total: number } {
             // Filter out tasks that cannot be opened for navigation
             // Note: Deferred tasks permission checking is handled in the navigation buttons themselves
-            const accessibleTasks = state.availableTasks.filter(task => {
+            const accessibleTasks = state.availableTasks.filter((task: Task) => {
                 // Vetoed tasks cannot be opened (they are view-only)
                 if (task.status === TaskStatus.VETOED) {
                     return false;
@@ -145,9 +147,9 @@ export const useWorkspaceStore = defineStore("workspace", {
                 
                 return true;
             });
-            
-            const currentIndex = state.currentTaskData && accessibleTasks.length > 0 
-                ? accessibleTasks.findIndex(task => task.id === state.currentTaskData?.id)
+
+            const currentIndex = state.currentTaskData && accessibleTasks.length > 0
+                ? accessibleTasks.findIndex((task: Task) => task.id === state.currentTaskData?.id)
                 : -1;
             
             return {
@@ -172,12 +174,12 @@ export const useWorkspaceStore = defineStore("workspace", {
         },
         canNavigateToPrevious(state): boolean {
             if (!state.currentTaskData || state.availableTasks.length === 0) return false;
-            const currentIndex = state.availableTasks.findIndex(task => task.id === state.currentTaskData?.id);
+            const currentIndex = state.availableTasks.findIndex((task: Task) => task.id === state.currentTaskData?.id);
             return currentIndex > 0;
         },
         canNavigateToNext(state): boolean {
             if (!state.currentTaskData || state.availableTasks.length === 0) return false;
-            const currentIndex = state.availableTasks.findIndex(task => task.id === state.currentTaskData?.id);
+            const currentIndex = state.availableTasks.findIndex((task: Task) => task.id === state.currentTaskData?.id);
             return currentIndex < state.availableTasks.length - 1;
         },
         canCompleteCurrentTask(state): boolean {
@@ -196,13 +198,13 @@ export const useWorkspaceStore = defineStore("workspace", {
                 state.currentWorkflowStageType === WorkflowStageType.COMPLETION) {
                 // In revision/completion stages, check if there are annotations for this asset
                 // (created in previous annotation stages)
-                const assetAnnotations = state.annotations.filter(annotation => 
+                const assetAnnotations = state.annotations.filter((annotation: Annotation) => 
                     annotation.assetId === state.currentAssetData?.id
                 );
                 return assetAnnotations.length > 0;
             } else {
                 // In annotation stages, check annotations for this specific task
-                const taskAnnotations = state.annotations.filter(annotation => 
+                const taskAnnotations = state.annotations.filter((annotation: Annotation) => 
                     annotation.taskId === state.currentTaskData?.id
                 );
                 return taskAnnotations.length > 0;
@@ -223,6 +225,51 @@ export const useWorkspaceStore = defineStore("workspace", {
 
             return false;
         },
+
+        // Task management core instances with access to store state
+        taskManager(): TaskManager {
+            const permissionsService = {
+                canUpdateProject: async () => {
+                    // Import permission check dynamically to avoid circular dependencies
+                    try {
+                        const { usePermissions } = await import('@/composables/usePermissions');
+                        const { canUpdateProject } = usePermissions();
+                        return canUpdateProject.value;
+                    } catch {
+                        return false;
+                    }
+                }
+            };
+
+            const timerService = {
+                getElapsedTime: () => this.timerInstance.getElapsedTime(),
+                isRunning: () => this.timerInstance.isRunning,
+                start: () => this.timerInstance.start(),
+                stop: () => this.timerInstance.stop(),
+                pause: () => this.timerInstance.pause(),
+                resume: () => this.timerInstance.start(), // Timer uses start() for resume
+                reset: () => this.timerInstance.reset()
+            };
+
+            return new TaskManager(taskService, permissionsService, timerService);
+        },
+
+        taskNavigationManager(): TaskNavigationManager {
+            const permissionsService = {
+                canUpdateProject: async () => {
+                    // Import permission check dynamically to avoid circular dependencies
+                    try {
+                        const { usePermissions } = await import('@/composables/usePermissions');
+                        const { canUpdateProject } = usePermissions();
+                        return canUpdateProject.value;
+                    } catch {
+                        return false;
+                    }
+                }
+            };
+
+            return new TaskNavigationManager(permissionsService);
+        }
     },
 
     actions: {
@@ -235,23 +282,25 @@ export const useWorkspaceStore = defineStore("workspace", {
             try {
                 logger.info(`Loading asset ${assetId} for project ${projectId}`);
 
-                // Convert string IDs to numbers for API calls
-                const numericProjectId = parseInt(projectId, 10);
-                const numericAssetId = parseInt(assetId, 10);
-
-                if (isNaN(numericProjectId) || isNaN(numericAssetId)) {
-                    throw new Error('Invalid project ID or asset ID');
+                // Use AssetManager to load the asset
+                const assetResult = await assetManager.loadAsset(projectId, assetId);
+                
+                if (!assetResult.success) {
+                    throw new Error(assetResult.error);
                 }
 
-                // Fetch asset data
-                const assetData = await assetService.getAssetById(numericProjectId, numericAssetId);
-                this.currentAssetData = assetData;
-                this.currentImageUrl = assetData.imageUrl || null;
+                // Set asset data from AssetManager result
+                this.currentAssetData = assetResult.asset;
+                this.currentImageUrl = assetResult.imageUrl;
+                this.imageNaturalDimensions = assetResult.naturalDimensions;
 
-                logger.info(`Loaded asset data:`, assetData);
+                logger.info(`Loaded asset data via AssetManager:`, assetResult.asset);
 
-                // Reset workspace state
-                this.imageNaturalDimensions = null;
+                // Convert IDs for other service calls (AssetManager already validated these)
+                const numericProjectId = parseInt(projectId, 10);
+                const numericAssetId = parseInt(assetId, 10);
+
+                // Reset other workspace state
                 this.viewOffset = { x: 0, y: 0 };
                 this.zoomLevel = 1;
                 this.annotations = [];
@@ -318,8 +367,8 @@ export const useWorkspaceStore = defineStore("workspace", {
                             logger.warn('Failed to fetch workflow stage type:', stageError);
                             this.currentWorkflowStageType = null;
                         }
-                        
-                        const taskIndex = this.availableTasks.findIndex(task => task.id === this.currentTaskData?.id);
+
+                        const taskIndex = this.availableTasks.findIndex((task: Task) => task.id === this.currentTaskData?.id);
                         logger.info(`Loaded ${this.availableTasks.length} tasks for stage ${workflowStageId}, current task is at index ${taskIndex}`);
                     } else {
                         logger.warn(`No tasks found for asset ${assetId}`);
@@ -440,15 +489,15 @@ export const useWorkspaceStore = defineStore("workspace", {
 
                 // Update the annotation in the store with the saved data (including ID)
                 // First try to find by clientId
-                let index = this.annotations.findIndex(a => a.clientId === annotation.clientId);
-                
+                let index = this.annotations.findIndex((a: Annotation) => a.clientId === annotation.clientId);
+
                 if (index !== -1) {
                     // Preserve the clientId when updating
                     this.annotations[index] = { ...savedAnnotation, clientId: annotation.clientId };
                     logger.debug(`Updated annotation by clientId: ${annotation.clientId}`);
                 } else {
                     // If clientId doesn't match, find by coordinates and other properties
-                    index = this.annotations.findIndex(a => 
+                    index = this.annotations.findIndex((a: Annotation) => 
                         !a.annotationId && // Only match unsaved annotations
                         a.assetId === savedAnnotation.assetId && 
                         a.labelId === savedAnnotation.labelId &&
@@ -473,7 +522,7 @@ export const useWorkspaceStore = defineStore("workspace", {
                 logger.error("Failed to save annotation:", error);
 
                 // Remove the annotation from the store on failure
-                this.annotations = this.annotations.filter(a => a.clientId !== annotation.clientId);
+                this.annotations = this.annotations.filter((a: Annotation) => a.clientId !== annotation.clientId);
 
                 // Set error state
                 this.error = error instanceof Error ? error.message : 'Failed to save annotation';
@@ -484,7 +533,7 @@ export const useWorkspaceStore = defineStore("workspace", {
          * Updates an existing annotation
          */
         async updateAnnotation(annotationId: number, updates: Partial<Annotation>) {
-            const index = this.annotations.findIndex(a => a.annotationId === annotationId);
+            const index = this.annotations.findIndex((a: Annotation) => a.annotationId === annotationId);
             if (index === -1) {
                 logger.error(`Annotation with ID ${annotationId} not found in store`);
                 return;
@@ -533,7 +582,7 @@ export const useWorkspaceStore = defineStore("workspace", {
          * Deletes an annotation
          */
         async deleteAnnotation(annotationId: number) {
-            const index = this.annotations.findIndex(a => a.annotationId === annotationId);
+            const index = this.annotations.findIndex((a: Annotation) => a.annotationId === annotationId);
             if (index === -1) {
                 logger.error(`Annotation with ID ${annotationId} not found in store`);
                 return;
@@ -676,7 +725,7 @@ export const useWorkspaceStore = defineStore("workspace", {
         },
         
         setActiveTool(toolId: ToolName) {
-            const toolExists = this.availableTools.some(tool => tool.id === toolId);
+            const toolExists = this.availableTools.some((tool: Tool) => tool.id === toolId);
             if (toolExists) {
                 this.activeTool = toolId;
             }
@@ -744,7 +793,7 @@ export const useWorkspaceStore = defineStore("workspace", {
                         this.currentTaskData.workingTimeMs = totalWorkingTime;
                         
                         // Update in the available tasks list as well
-                        const taskIndex = this.availableTasks.findIndex(task => task.id === this.currentTaskData?.id);
+                        const taskIndex = this.availableTasks.findIndex((task: Task) => task.id === this.currentTaskData?.id);
                         if (taskIndex !== -1) {
                             this.availableTasks[taskIndex].workingTimeMs = totalWorkingTime;
                         }
@@ -781,7 +830,7 @@ export const useWorkspaceStore = defineStore("workspace", {
                         this.currentTaskData.workingTimeMs = totalWorkingTime;
                         
                         // Update in the available tasks list as well
-                        const taskIndex = this.availableTasks.findIndex(task => task.id === this.currentTaskData?.id);
+                        const taskIndex = this.availableTasks.findIndex((task: Task) => task.id === this.currentTaskData?.id);
                         if (taskIndex !== -1) {
                             this.availableTasks[taskIndex].workingTimeMs = totalWorkingTime;
                         }
@@ -842,26 +891,8 @@ export const useWorkspaceStore = defineStore("workspace", {
          * Check if a task can be opened by the current user
          */
         async canOpenTask(task: Task): Promise<boolean> {
-            // Import permission check dynamically to avoid circular dependencies
-            const { usePermissions } = await import('@/composables/usePermissions');
-            const { canUpdateProject } = usePermissions();
-            
-            // Deferred tasks can only be opened by managers
-            if (task.status === TaskStatus.DEFERRED && !canUpdateProject.value) {
-                return false;
-            }
-            
-            // Vetoed tasks cannot be opened (they are view-only)
-            if (task.status === TaskStatus.VETOED) {
-                return false;
-            }
-            
-            // Completed and archived tasks cannot be opened
-            if (task.status && [TaskStatus.COMPLETED, TaskStatus.ARCHIVED].includes(task.status)) {
-                return false;
-            }
-            
-            return true;
+            // Use TaskManager to check if the task can be opened
+            return await this.taskManager.canOpenTask(task);
         },
 
         /**
@@ -873,27 +904,19 @@ export const useWorkspaceStore = defineStore("workspace", {
                 return null;
             }
 
-            const currentIndex = this.availableTasks.findIndex(task => task.id === this.currentTaskData?.id);
-            
-            // Look for the previous available task that can be opened
-            for (let i = currentIndex - 1; i >= 0; i--) {
-                const previousTask = this.availableTasks[i];
-                const canOpen = await this.canOpenTask(previousTask);
-                
-                if (canOpen) {
-                    logger.info(`Navigating to previous task: ${previousTask.id} (asset ${previousTask.assetId})`);
-                    return {
-                        projectId: this.currentProjectId!,
-                        assetId: previousTask.assetId.toString(),
-                        taskId: previousTask.id.toString()
-                    };
-                } else {
-                    logger.debug(`Skipping previous task ${previousTask.id} - status: ${previousTask.status}`);
-                }
+            // Use TaskNavigationManager to find previous task
+            const result = await this.taskNavigationManager.navigateToPrevious(
+                this.currentTaskData,
+                this.availableTasks,
+                this.currentProjectId!
+            );
+
+            if (!result.success) {
+                logger.error('Failed to navigate to previous task:', result.error);
+                return null;
             }
-            
-            logger.info('No accessible previous task found');
-            return null;
+
+            return result.navigation;
         },
 
         /**
@@ -905,27 +928,19 @@ export const useWorkspaceStore = defineStore("workspace", {
                 return null;
             }
 
-            const currentIndex = this.availableTasks.findIndex(task => task.id === this.currentTaskData?.id);
-            
-            // Look for the next available task that can be opened
-            for (let i = currentIndex + 1; i < this.availableTasks.length; i++) {
-                const nextTask = this.availableTasks[i];
-                const canOpen = await this.canOpenTask(nextTask);
-                
-                if (canOpen) {
-                    logger.info(`Navigating to next task: ${nextTask.id} (asset ${nextTask.assetId})`);
-                    return {
-                        projectId: this.currentProjectId!,
-                        assetId: nextTask.assetId.toString(),
-                        taskId: nextTask.id.toString()
-                    };
-                } else {
-                    logger.debug(`Skipping next task ${nextTask.id} - status: ${nextTask.status}`);
-                }
+            // Use TaskNavigationManager to find next task
+            const result = await this.taskNavigationManager.navigateToNext(
+                this.currentTaskData,
+                this.availableTasks,
+                this.currentProjectId!
+            );
+
+            if (!result.success) {
+                logger.error('Failed to navigate to next task:', result.error);
+                return null;
             }
-            
-            logger.info('No accessible next task found');
-            return null;
+
+            return result.navigation;
         },
 
         /**
@@ -940,28 +955,28 @@ export const useWorkspaceStore = defineStore("workspace", {
             try {
                 const numericProjectId = parseInt(this.currentProjectId);
                 
-                logger.info('Completing task using pipeline system', { taskId: this.currentTaskData.id });
-                
-                const result = await taskService.completeTaskPipeline(numericProjectId, this.currentTaskData.id);
+                // Use TaskManager to complete the task
+                const result = await this.taskManager.completeTask(numericProjectId, this.currentTaskData.id);
                 
-                if (!result.isSuccess) {
-                    throw new Error(result.errorMessage || 'Task completion failed');
+                if (!result.success) {
+                    this.error = result.error || 'Failed to complete task';
+                    return false;
                 }
                 
-                // Refresh current task data
-                const updatedTask = await taskService.getTaskById(numericProjectId, this.currentTaskData.id);
-                this.currentTaskData = updatedTask;
-                
-                // Update the task in the available tasks list
-                const taskIndex = this.availableTasks.findIndex(task => task.id === updatedTask.id);
-                if (taskIndex !== -1) {
-                    this.availableTasks[taskIndex] = updatedTask;
+                // Update current task data
+                if (result.task) {
+                    this.currentTaskData = result.task;
+                    
+                    // Update the task in the available tasks list
+                    const taskIndex = this.availableTasks.findIndex((task: Task) => task.id === result.task!.id);
+                    if (taskIndex !== -1) {
+                        this.availableTasks[taskIndex] = result.task;
+                    }
                 }
 
-                logger.info(`Successfully completed task ${this.currentTaskData.id} via pipeline`, { details: result.details });
                 return true;
             } catch (error) {
-                logger.error('Failed to complete task via pipeline:', error);
+                logger.error('Failed to complete task via TaskManager:', error);
                 this.error = error instanceof Error ? error.message : 'Failed to complete task';
                 return false;
             }
@@ -979,24 +994,32 @@ export const useWorkspaceStore = defineStore("workspace", {
             try {
                 const numericProjectId = parseInt(this.currentProjectId);
 
-                // Use the shared working time preservation logic
-                const suspendedTask = await this._saveWorkingTimeAndChangeStatus(
-                    () => taskService.changeTaskStatus(
-                        numericProjectId, this.currentTaskData!.id, { targetStatus: TaskStatus.SUSPENDED }
-                    ),
-                    'suspension'
+                // Use TaskManager to suspend the task with working time preservation
+                const result = await this.taskManager.suspendTask(
+                    numericProjectId, 
+                    this.currentTaskData.id, 
+                    this.lastSavedWorkingTime
                 );
                 
-                // Update the task in the available tasks list
-                const taskIndex = this.availableTasks.findIndex(task => task.id === suspendedTask.id);
-                if (taskIndex !== -1) {
-                    this.availableTasks[taskIndex] = suspendedTask;
+                if (!result.success) {
+                    this.error = result.error || 'Failed to suspend task';
+                    return false;
+                }
+                
+                // Update current task data
+                if (result.task) {
+                    this.currentTaskData = result.task;
+                    
+                    // Update the task in the available tasks list
+                    const taskIndex = this.availableTasks.findIndex((task: Task) => task.id === result.task!.id);
+                    if (taskIndex !== -1) {
+                        this.availableTasks[taskIndex] = result.task;
+                    }
                 }
                 
-                logger.info(`Successfully suspended task ${this.currentTaskData.id}`);
                 return true;
             } catch (error) {
-                logger.error('Failed to suspend task:', error);
+                logger.error('Failed to suspend task via TaskManager:', error);
                 this.error = error instanceof Error ? error.message : 'Failed to suspend task';
                 return false;
             }
@@ -1014,24 +1037,32 @@ export const useWorkspaceStore = defineStore("workspace", {
             try {
                 const numericProjectId = parseInt(this.currentProjectId);
                 
-                // Use the shared working time preservation logic
-                const deferredTask = await this._saveWorkingTimeAndChangeStatus(
-                    () => taskService.changeTaskStatus(
-                        numericProjectId, this.currentTaskData!.id, { targetStatus: TaskStatus.DEFERRED }
-                    ),
-                    'deferring'
+                // Use TaskManager to defer the task with working time preservation
+                const result = await this.taskManager.deferTask(
+                    numericProjectId, 
+                    this.currentTaskData.id, 
+                    this.lastSavedWorkingTime
                 );
                 
-                // Update the task in the available tasks list
-                const taskIndex = this.availableTasks.findIndex(task => task.id === deferredTask.id);
-                if (taskIndex !== -1) {
-                    this.availableTasks[taskIndex] = deferredTask;
+                if (!result.success) {
+                    this.error = result.error || 'Failed to defer task';
+                    return false;
+                }
+                
+                // Update current task data
+                if (result.task) {
+                    this.currentTaskData = result.task;
+                    
+                    // Update the task in the available tasks list
+                    const taskIndex = this.availableTasks.findIndex((task: Task) => task.id === result.task!.id);
+                    if (taskIndex !== -1) {
+                        this.availableTasks[taskIndex] = result.task;
+                    }
                 }
                 
-                logger.info(`Successfully deferred task ${this.currentTaskData.id}`);
                 return true;
             } catch (error) {
-                logger.error('Failed to defer task:', error);
+                logger.error('Failed to defer task via TaskManager:', error);
                 this.error = error instanceof Error ? error.message : 'Failed to defer task';
                 return false;
             }
@@ -1049,32 +1080,32 @@ export const useWorkspaceStore = defineStore("workspace", {
             try {
                 const numericProjectId = parseInt(this.currentProjectId);
                 
-                logger.info('Returning task for rework using veto pipeline', { taskId: this.currentTaskData.id, reason });
-                
-                // Use the veto pipeline to handle all operations atomically
-                const pipelineResult = await taskService.vetoTaskPipeline(numericProjectId, this.currentTaskData.id, {
-                    reason: reason || 'Task returned for rework'
-                });
+                // Use TaskManager to veto the task
+                const result = await this.taskManager.vetoTask(
+                    numericProjectId, 
+                    this.currentTaskData.id, 
+                    reason
+                );
                 
-                if (!pipelineResult.isSuccess) {
-                    throw new Error(pipelineResult.errorMessage || 'Veto pipeline failed');
+                if (!result.success) {
+                    this.error = result.error || 'Failed to return task for rework';
+                    return false;
                 }
                 
-                // Refresh current task data with the result from the pipeline
-                if (pipelineResult.updatedTask) {
-                    this.currentTaskData = pipelineResult.updatedTask;
+                // Update current task data
+                if (result.task) {
+                    this.currentTaskData = result.task;
                     
                     // Update the task in the available tasks list
-                    const taskIndex = this.availableTasks.findIndex(task => task.id === pipelineResult.updatedTask!.id);
+                    const taskIndex = this.availableTasks.findIndex((task: Task) => task.id === result.task!.id);
                     if (taskIndex !== -1) {
-                        this.availableTasks[taskIndex] = pipelineResult.updatedTask;
+                        this.availableTasks[taskIndex] = result.task;
                     }
                 }
 
-                logger.info(`Successfully returned task ${this.currentTaskData?.id} for rework`, { reason });
                 return true;
             } catch (error) {
-                logger.error('Failed to return task for rework:', error);
+                logger.error('Failed to return task for rework via TaskManager:', error);
                 this.error = error instanceof Error ? error.message : 'Failed to return task for rework';
                 return false;
             }
@@ -1089,34 +1120,19 @@ export const useWorkspaceStore = defineStore("workspace", {
                 return null;
             }
 
-            const currentIndex = this.availableTasks.findIndex(task => task.id === this.currentTaskData?.id);
-
-            // Look for next uncompleted task
-            for (let i = currentIndex + 1; i < this.availableTasks.length; i++) {
-                const task = this.availableTasks[i];
-                if (!task.completedAt) {
-                    return {
-                        projectId: this.currentProjectId!,
-                        assetId: task.assetId.toString(),
-                        taskId: task.id.toString()
-                    };
-                }
-            }
+            // Use TaskNavigationManager to find next available task
+            const result = await this.taskNavigationManager.getNextAvailableTask(
+                this.currentTaskData,
+                this.availableTasks,
+                this.currentProjectId!
+            );
 
-            // If no task found after current, wrap around to beginning
-            for (let i = 0; i < currentIndex; i++) {
-                const task = this.availableTasks[i];
-                if (!task.completedAt) {
-                    return {
-                        projectId: this.currentProjectId!,
-                        assetId: task.assetId.toString(),
-                        taskId: task.id.toString()
-                    };
-                }
+            if (!result.success) {
+                logger.error('Failed to get next available task:', result.error);
+                return null;
             }
 
-            logger.info('No more uncompleted tasks available');
-            return null;
+            return result.navigation;
         },
 
 
diff --git a/frontend/src/stores/workspaceStore.types.ts b/frontend/src/stores/workspaceStore.types.ts
new file mode 100644
index 00000000..1c6aedc2
--- /dev/null
+++ b/frontend/src/stores/workspaceStore.types.ts
@@ -0,0 +1,246 @@
+import type { ImageDimensions } from "@/core/asset/asset.types";
+import type { Timer } from "@/core/timing";
+import type { Point } from "@/core/geometry/geometry.types";
+import type { Tool, ToolName } from "@/core/workspace/tools.types";
+import type { Annotation } from '@/core/workspace/annotation.types';
+import type { LabelScheme } from '@/services/project/labelScheme/label.types';
+import type { Asset } from '@/core/asset/asset.types';
+import type { Task } from '@/services/project/task/task.types';
+import type { WorkflowStageType } from '@/services/project/workflow/workflowStage.types';
+
+/**
+ * Current flat workspace store state interface (legacy structure)
+ * This matches the actual current implementation in workspaceStore.ts
+ */
+export interface WorkspaceState {
+    // Asset-related properties
+    currentProjectId: string | null;
+    currentAssetId: string | null;
+    currentAssetData: Asset | null;
+    currentImageUrl: string | null;
+    imageNaturalDimensions: ImageDimensions | null;
+    canvasDisplayDimensions: ImageDimensions | null;
+    
+    // Timer-related properties
+    timerInstance: Timer;
+    elapsedTimeDisplay: string;
+    timerIntervalId: number | null;
+    lastSavedWorkingTime: number;
+    
+    // UI-related properties
+    viewOffset: Point;
+    zoomLevel: number;
+    activeTool: ToolName;
+    availableTools: Tool[];
+    isLoading: boolean;
+    error: string | null;
+    
+    // Annotation-related properties
+    annotations: Annotation[];
+    currentLabelId: number | null;
+    currentLabelScheme: LabelScheme | null;
+    availableLabelSchemes: LabelScheme[];
+    
+    // Task-related properties
+    currentTaskId: number | null;
+    currentTaskData: Task | null;
+    currentWorkflowStageType: WorkflowStageType | null;
+    availableTasks: Task[];
+    initialTaskId: number | null;
+}
+
+/**
+ * Asset-related state in the workspace store
+ */
+export interface WorkspaceAssetState {
+    currentProjectId: string | null;
+    currentAssetId: string | null;
+    currentAssetData: Asset | null;
+    currentImageUrl: string | null;
+    imageNaturalDimensions: ImageDimensions | null;
+    canvasDisplayDimensions: ImageDimensions | null;
+}
+
+/**
+ * Task-related state in the workspace store
+ */
+export interface WorkspaceTaskState {
+    currentTaskId: number | null;
+    currentTaskData: Task | null;
+    currentWorkflowStageType: WorkflowStageType | null;
+    availableTasks: Task[];
+    initialTaskId: number | null;
+}
+
+/**
+ * Timer-related state in the workspace store
+ */
+export interface WorkspaceTimerState {
+    timerInstance: Timer;
+    elapsedTimeDisplay: string;
+    timerIntervalId: number | null;
+    lastSavedWorkingTime: number;
+}
+
+/**
+ * Annotation-related state in the workspace store
+ */
+export interface WorkspaceAnnotationState {
+    annotations: Annotation[];
+    currentLabelId: number | null;
+    currentLabelScheme: LabelScheme | null;
+    availableLabelSchemes: LabelScheme[];
+}
+
+/**
+ * UI-related state in the workspace store
+ */
+export interface WorkspaceUIState {
+    viewOffset: Point;
+    zoomLevel: number;
+    activeTool: ToolName;
+    availableTools: Tool[];
+    isLoading: boolean;
+    error: string | null;
+}
+
+/**
+ * Main workspace store state interface
+ * Organized by domain concerns instead of flat structure
+ */
+export interface WorkspaceStoreState {
+    asset: WorkspaceAssetState;
+    task: WorkspaceTaskState;
+    timer: WorkspaceTimerState;
+    annotation: WorkspaceAnnotationState;
+    ui: WorkspaceUIState;
+}
+
+/**
+ * Parameters for loading a workspace
+ */
+export interface WorkspaceLoadParams {
+    projectId: string;
+    assetId: string;
+    taskId?: string;
+}
+
+/**
+ * Parameters for initializing a workspace
+ */
+export interface WorkspaceInitParams {
+    projectId: string;
+    assetId: string;
+    taskId?: string;
+    loadAnnotations?: boolean;
+    loadTasks?: boolean;
+    loadLabelSchemes?: boolean;
+}
+
+/**
+ * Complete workspace loading result (includes asset, annotations, tasks, etc.)
+ */
+export type WorkspaceLoadResult = {
+    success: true;
+    asset: Asset;
+    imageUrl: string | null;
+    naturalDimensions: ImageDimensions | null;
+    annotations: Annotation[];
+    labelScheme: LabelScheme | null;
+    tasks: Task[];
+} | {
+    success: false;
+    error: string;
+}
+
+/**
+ * Result of task operations (complete, suspend, defer, etc.)
+ */
+export type TaskResult = {
+    success: true;
+    task: Task;
+} | {
+    success: false;
+    error: string;
+}
+
+/**
+ * Navigation information for task navigation
+ */
+export interface NavigationInfo {
+    projectId: string;
+    assetId: string;
+    taskId: string;
+}
+
+/**
+ * Result of navigation operations
+ */
+export type NavigationResult = {
+    success: true;
+    nextTask: NavigationInfo;
+} | {
+    success: false;
+    error: string;
+}
+
+
+/**
+ * Result of workspace initialization
+ */
+export type WorkspaceInitResult = {
+    success: true;
+    assetData: Asset;
+    taskData: Task | null;
+    annotations: Annotation[];
+    labelScheme: LabelScheme | null;
+    availableTasks: Task[];
+} | {
+    success: false;
+    error: string;
+}
+
+/**
+ * Configuration for workspace operations
+ */
+export interface WorkspaceConfig {
+    autoSaveInterval: number;
+    maxZoom: number;
+    minZoom: number;
+    zoomSensitivity: number;
+}
+
+/**
+ * Workspace operation context
+ */
+export interface WorkspaceOperationContext {
+    projectId: string;
+    assetId?: string;
+    taskId?: number;
+    userId?: string;
+}
+
+/**
+ * Workspace events that can be emitted
+ */
+export enum WorkspaceEvent {
+    ASSET_LOADED = 'asset_loaded',
+    TASK_CHANGED = 'task_changed',
+    ANNOTATION_CREATED = 'annotation_created',
+    ANNOTATION_UPDATED = 'annotation_updated',
+    ANNOTATION_DELETED = 'annotation_deleted',
+    TIMER_STARTED = 'timer_started',
+    TIMER_PAUSED = 'timer_paused',
+    TIMER_STOPPED = 'timer_stopped',
+    ERROR_OCCURRED = 'error_occurred'
+}
+
+/**
+ * Event payload for workspace events
+ */
+export interface WorkspaceEventPayload {
+    event: WorkspaceEvent;
+    data: any;
+    timestamp: number;
+    context: WorkspaceOperationContext;
+}
\ No newline at end of file
diff --git a/frontend/src/types/auth/role.ts b/frontend/src/types/auth/role.ts
deleted file mode 100644
index 27b953b0..00000000
--- a/frontend/src/types/auth/role.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum RoleEnum {
-    ADMIN = 'ADMIN',
-    MANAGER = 'MANAGER',
-    USER = 'USER'
-}
\ No newline at end of file
diff --git a/frontend/src/types/common/index.ts b/frontend/src/types/common/index.ts
deleted file mode 100644
index 28af8083..00000000
--- a/frontend/src/types/common/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Common error types and type guards
-export {
-    AppError,
-    NetworkError,
-    ApiResponseError,
-    ServerError,
-    ValidationError,
-    UserVisibleError,
-    ToolError,
-    StoreError,
-    isApiResponseError,
-    isValidationError,
-    isServerError,
-    isNetworkError,
-    isUserVisibleError,
-    isToolError
-} from './errors';
-
-export {
-    transformApiError,
-    isValidApiResponse,
-    isValidPaginatedResponse,
-    isValidResponseWithCustomValidation
-} from '../../services/utils';
-
-// Table types
-export type {
-    TableColumn,
-    TableAction,
-    TableRowAction,
-    TablePagination,
-    TableSortConfig,
-    TableData,
-    TableConfig
-} from './table';
diff --git a/frontend/src/types/common/point.ts b/frontend/src/types/common/point.ts
deleted file mode 100644
index 7d51ca74..00000000
--- a/frontend/src/types/common/point.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface Point {
-    x: number;
-    y: number;
-}
\ No newline at end of file
diff --git a/frontend/src/types/common/table.ts b/frontend/src/types/common/table.ts
deleted file mode 100644
index 52cc384c..00000000
--- a/frontend/src/types/common/table.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-export interface TableColumn {
-    key: string;
-    label: string;
-    sortable?: boolean;
-    width?: string;
-    align?: 'left' | 'center' | 'right';
-    format?: 'text' | 'date' | 'datetime' | 'number' | 'currency' | 'custom';
-    component?: any;
-    cellClass?: string;
-    headerClass?: string;
-}
-
-export interface TableAction {
-    key: string;
-    label: string;
-    icon?: any;
-    variant?: 'primary' | 'secondary';
-    disabled?: boolean;
-}
-
-export interface TableRowAction<T = any> {
-    key: string;
-    label?: string;
-    icon?: any;
-    variant?: 'primary' | 'secondary';
-    disabled?: (row: T) => boolean;
-    tooltip?: (row: T) => string;
-}
-
-export interface TablePagination {
-    currentPage: number;
-    totalPages: number;
-    pageSize: number;
-    totalItems: number;
-}
-
-export interface TableSortConfig {
-    key: string;
-    direction: 'asc' | 'desc';
-}
-
-// Generic table data interface
-export interface TableData {
-    [key: string]: any;
-}
-
-// Table configuration interface
-export interface TableConfig<T = TableData> {
-    data: T[];
-    columns: TableColumn[];
-    title?: string;
-    actions?: TableAction[];
-    rowActions?: TableRowAction<T>[];
-    isLoading?: boolean;
-    error?: string | null;
-    emptyMessage?: string;
-    emptyDescription?: string;
-    rowKey?: string;
-    clickableRows?: boolean;
-    pagination?: TablePagination;
-    defaultSort?: TableSortConfig;
-}
diff --git a/frontend/src/types/components/pageLoader.ts b/frontend/src/types/components/pageLoader.ts
deleted file mode 100644
index 166a1524..00000000
--- a/frontend/src/types/components/pageLoader.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface PageLoaderProps {
-    title?: string;
-    subtitle?: string;
-    message?: string;
-    showProgress?: boolean;
-    progress?: number;
-    transparent?: boolean;
-}
\ No newline at end of file
diff --git a/frontend/src/types/dashboard/index.ts b/frontend/src/types/dashboard/index.ts
deleted file mode 100644
index b9cbc247..00000000
--- a/frontend/src/types/dashboard/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-export type {
-    // Core Analytics DTOs
-    WorkflowProgressDto,
-    WorkflowStageProgressDto,
-    UserPerformanceDto,
-    RecentActivityDto,
-    ProjectHealthDto,
-    TaskStatisticsDto,
-    TaskStatusDistributionDto,
-    DailyTaskCountDto,
-    DailyProductivityDto,
-    DashboardAnalyticsDto,
-    
-    // Widget System DTOs
-    WidgetDefinitionDto,
-    WidgetInstanceDto,
-    WidgetSettingDto,
-    WidgetSettingOptionDto,
-    DashboardLayoutDto,
-    DashboardConfigurationDto,
-    CreateUpdateDashboardConfigurationDto,
-    WidgetDataRequestDto,
-    WidgetDataDto,
-    
-    // Frontend State Management Types
-    DashboardState,
-    WidgetFilter,
-    
-    // Chart Data Interfaces
-    ChartDataPoint,
-    TimeSeriesDataPoint,
-    ProgressChartData
-} from './dashboard';
diff --git a/frontend/src/types/dataSource/dataSource.ts b/frontend/src/types/dataSource/dataSource.ts
deleted file mode 100644
index 984b0e85..00000000
--- a/frontend/src/types/dataSource/dataSource.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export enum DataSourceType {
-    MINIO_BUCKET = 'MINIO_BUCKET',
-    S3_BUCKET = 'S3_BUCKET',
-    GSC_BUCKET = 'GSC_BUCKET',
-    AZURE_BLOB_STORAGE = 'AZURE_BLOB_STORAGE',
-    LOCAL_DIRECTORY = 'LOCAL_DIRECTORY',
-    DATABASE = 'DATABASE',
-    API = 'API',
-    OTHER = 'OTHER',
-}
-
-export enum DataSourceStatus {
-    ACTIVE = 'ACTIVE',
-    INACTIVE = 'INACTIVE',
-    SYNCING = 'SYNCING',
-    ERROR = 'ERROR',
-    ARCHIVED = 'ARCHIVED',
-}
-
-export interface DataSource {
-    id: number;
-    name: string;
-    description?: string;
-    sourceType: DataSourceType;
-    status: DataSourceStatus;
-    isDefault: boolean;
-    createdAt: string;
-    projectId: number;
-    assetCount?: number;
-}
\ No newline at end of file
diff --git a/frontend/src/types/dataSource/index.ts b/frontend/src/types/dataSource/index.ts
deleted file mode 100644
index f13c8a88..00000000
--- a/frontend/src/types/dataSource/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export type { DataSource } from './dataSource';
-export { DataSourceType, DataSourceStatus } from './dataSource';
-
-export type {
-    CreateDataSourceRequest,
-    UpdateDataSourceRequest,
-    DataSourceListParams,
-    DataSourceStatsResponse,
-    AvailableDataSourceTypesResponse,
-} from './requests';
diff --git a/frontend/src/types/dataSource/requests.ts b/frontend/src/types/dataSource/requests.ts
deleted file mode 100644
index aac17e01..00000000
--- a/frontend/src/types/dataSource/requests.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { DataSourceType, DataSourceStatus } from './dataSource';
-import type { QueryParams } from '../api';
-
-export interface CreateDataSourceRequest {
-    name: string;
-    description?: string;
-    sourceType: DataSourceType;
-    connectionDetails?: string;
-}
-
-export interface UpdateDataSourceRequest {
-    name: string;
-    description?: string;
-    status: DataSourceStatus;
-    connectionDetails?: string;
-}
-
-export interface DataSourceListParams extends QueryParams {
-    projectId?: number;
-    status?: DataSourceStatus;
-    sourceType?: DataSourceType;
-}
-
-export interface DataSourceStatsResponse {
-    totalDataSources: number;
-    activeDataSources: number;
-    totalAssets: number;
-    syncingDataSources: number;
-}
-
-export interface AvailableDataSourceTypesResponse {
-    availableTypes: DataSourceType[];
-}
diff --git a/frontend/src/types/image/imageDimensions.ts b/frontend/src/types/image/imageDimensions.ts
deleted file mode 100644
index b612a63c..00000000
--- a/frontend/src/types/image/imageDimensions.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface ImageDimensions {
-    width: number;
-    height: number;
-}
\ No newline at end of file
diff --git a/frontend/src/types/label/index.ts b/frontend/src/types/label/index.ts
deleted file mode 100644
index 59dd6cae..00000000
--- a/frontend/src/types/label/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export type { Label } from './label';
-export type { LabelScheme, FormPayloadLabelScheme } from './labelScheme';
-export type { 
-    CreateLabelSchemeRequest, 
-    UpdateLabelSchemeRequest,
-    CreateLabelRequest,
-    UpdateLabelRequest,
-} from './requests';
-export type { 
-    LabelSchemeResponse, 
-    LabelResponse,
-} from './responses';
diff --git a/frontend/src/types/label/label.ts b/frontend/src/types/label/label.ts
deleted file mode 100644
index de26a8d6..00000000
--- a/frontend/src/types/label/label.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface Label {
-    labelId: number;
-    name: string;
-    color: string;
-    description?: string;
-    labelSchemeId: number;
-    createdAt: string;
-}
\ No newline at end of file
diff --git a/frontend/src/types/label/labelScheme.ts b/frontend/src/types/label/labelScheme.ts
deleted file mode 100644
index f16d951e..00000000
--- a/frontend/src/types/label/labelScheme.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { Label } from './label';
-
-export interface LabelScheme {
-    labelSchemeId: number;
-    name: string;
-    description?: string;
-    projectId: number;
-    isDefault?: boolean;
-    isActive: boolean;
-    createdAt: string;
-    deletedAt?: string;
-    labels?: Label[];
-}
-
-export interface FormPayloadLabelScheme {
-    name: string;
-    description?: string;
-    labels?: {
-        name: string;
-        color: string;
-        description?: string;
-    }[];
-}
-
-export interface LabelSchemeDeletionImpact {
-    labelSchemeId: number;
-    labelSchemeName: string;
-    totalLabelsCount: number;
-    totalAnnotationsCount: number;
-    labelImpacts: LabelImpact[];
-}
-
-export interface LabelImpact {
-    labelId: number;
-    labelName: string;
-    labelColor?: string;
-    annotationsCount: number;
-}
\ No newline at end of file
diff --git a/frontend/src/types/label/requests.ts b/frontend/src/types/label/requests.ts
deleted file mode 100644
index e78707b0..00000000
--- a/frontend/src/types/label/requests.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { Label } from './label';
-
-export interface CreateLabelSchemeRequest {
-    name: string;
-    description?: string;
-    labels?: Omit<Label, 'labelId' | 'labelSchemeId'>[];
-}
-
-export interface UpdateLabelSchemeRequest {
-    name?: string;
-    description?: string;
-}
-
-export interface CreateLabelRequest {
-    name: string;
-    color: string;
-    description?: string;
-    metadata?: any;
-}
-
-export interface UpdateLabelRequest {
-    name?: string;
-    color?: string;
-    description?: string;
-    metadata?: any;
-}
\ No newline at end of file
diff --git a/frontend/src/types/label/responses.ts b/frontend/src/types/label/responses.ts
deleted file mode 100644
index ce476f69..00000000
--- a/frontend/src/types/label/responses.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export interface LabelSchemeResponse {
-    id: number;
-    name: string;
-    description?: string;
-    projectId: number;
-    isDefault: boolean;
-    isActive: boolean;
-    createdAt: string;
-    deletedAt?: string;
-    labels: LabelResponse[];
-}
-
-export interface LabelResponse {
-    id: number;
-    name: string;
-    color: string;
-    description?: string;
-    labelSchemeId: number;
-    metadata?: any;
-    createdAt: string;
-    updatedAt: string;
-}
diff --git a/frontend/src/types/logging.ts b/frontend/src/types/logging.ts
deleted file mode 100644
index ce700d38..00000000
--- a/frontend/src/types/logging.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export enum LogLevel {
-    DEBUG = 'debug',
-    INFO = 'info',
-    WARN = 'warn',
-    ERROR = 'error'
-}
-
-export interface LogConfig {
-    readonly level: LogLevel;
-    readonly enableInProduction: boolean;
-    readonly enableTimestamps: boolean;
-    readonly enableServicePrefix: boolean;
-}
diff --git a/frontend/src/types/project/index.ts b/frontend/src/types/project/index.ts
deleted file mode 100644
index 208696b8..00000000
--- a/frontend/src/types/project/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export type { Project } from './project';
-export { ProjectType, ProjectStatus, ProjectRole } from './project';
-
-export type {
-    CreateProjectRequest,
-    UpdateProjectRequest,
-    ProjectStatsResponse,
-} from './requests';
diff --git a/frontend/src/types/project/requests.ts b/frontend/src/types/project/requests.ts
deleted file mode 100644
index 6739b923..00000000
--- a/frontend/src/types/project/requests.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { ProjectType, ProjectStatus } from './project';
-
-export interface CreateProjectRequest {
-    name: string;
-    description?: string;
-    projectType: ProjectType;
-}
-
-export interface UpdateProjectRequest {
-    name: string;
-    description?: string;
-    status: ProjectStatus;
-    annotationGuidelinesUrl?: string;
-}
-
-export interface ProjectStatsResponse {
-    totalAssets: number;
-    annotatedAssets: number;
-    totalAnnotations: number;
-    activeAnnotators: number;
-    completionPercentage: number;
-}
diff --git a/frontend/src/types/projectInvitation/index.ts b/frontend/src/types/projectInvitation/index.ts
deleted file mode 100644
index d8e3c1f7..00000000
--- a/frontend/src/types/projectInvitation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { ProjectInvitationDto } from './projectInvitation';
diff --git a/frontend/src/types/projectMember/index.ts b/frontend/src/types/projectMember/index.ts
deleted file mode 100644
index d8e84b98..00000000
--- a/frontend/src/types/projectMember/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type { ProjectMember, InviteMemberRequest } from './projectMember';
\ No newline at end of file
diff --git a/frontend/src/types/storage/index.ts b/frontend/src/types/storage/index.ts
deleted file mode 100644
index 0b4badf8..00000000
--- a/frontend/src/types/storage/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './lastProject';
-export * from './lastStage';
\ No newline at end of file
diff --git a/frontend/src/types/storage/lastProject.ts b/frontend/src/types/storage/lastProject.ts
deleted file mode 100644
index f5f14999..00000000
--- a/frontend/src/types/storage/lastProject.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface LastProjectData {
-    projectId: number;
-    projectName: string;
-    lastAccessedAt: number;
-}
\ No newline at end of file
diff --git a/frontend/src/types/task/index.ts b/frontend/src/types/task/index.ts
deleted file mode 100644
index e4e6d799..00000000
--- a/frontend/src/types/task/index.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export type {
-    Task,
-    TaskEvent,
-    CreateTaskRequest,
-    UpdateTaskRequest,
-    TaskWithDetails,
-    TaskTableRow
-} from './task';
-
-export {
-    TaskEventType,
-    TaskStatus,
-    type ChangeTaskStatusDto,
-    type ReturnTaskForReworkDto,
-    type CompleteTaskDto,
-    type VetoTaskDto,
-    type PipelineResultDto
-} from './task';
-
-export type {
-    TaskFilters,
-    TasksQueryParams,
-    GetTasksResponse
-} from './taskService';
-
-export type {
-    BulkOperationResult,
-    BulkOperationError,
-    BulkOperationOptions,
-    BulkPriorityUpdateRequest,
-    BulkAssignmentRequest,
-    BulkArchiveRequest,
-    TaskSelectionManager,
-    TaskBulkOperationsService,
-    SelectionState,
-    BulkOperationEvents
-} from './selection';
diff --git a/frontend/src/types/toast/index.ts b/frontend/src/types/toast/index.ts
deleted file mode 100644
index ae657f4c..00000000
--- a/frontend/src/types/toast/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export type ToastType = 'success' | 'error' | 'warning' | 'info';
-
-export interface Toast {
-    id: string;
-    title: string;
-    message: string;
-    type: ToastType;
-    duration?: number;
-    persistent?: boolean;
-    createdAt: number;
-}
-
-export interface ToastOptions {
-    duration?: number;
-    persistent?: boolean;
-}
\ No newline at end of file
diff --git a/frontend/src/types/workflow/index.ts b/frontend/src/types/workflow/index.ts
deleted file mode 100644
index 69831395..00000000
--- a/frontend/src/types/workflow/index.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// Export pipeline-specific types
-export type {
-    Workflow,
-    CreateWorkflowRequest,
-    UpdateWorkflowRequest,
-    WorkflowWithStages,
-    CreateWorkflowWithStagesRequest,
-    CreateWorkflowStageWithAssignmentsRequest,
-} from './workflow';
-
-export type {
-    WorkflowStage,
-    CreateWorkflowStageRequest,
-    UpdateWorkflowStageRequest,
-    WorkflowStageConnection,
-    CreateWorkflowStageConnectionRequest,
-    UpdateWorkflowStageConnectionRequest,
-    WorkflowStageAssignment,
-    CreateWorkflowStageAssignmentRequest,
-    WorkflowStageWithUsers,
-    WorkflowStagePipeline,
-} from './workflowstage';
-
-export {
-    WorkflowStageType,
-    formatStageType
-} from './workflowstage';
diff --git a/frontend/src/types/workspace/workspaceState.ts b/frontend/src/types/workspace/workspaceState.ts
deleted file mode 100644
index b6f5bb28..00000000
--- a/frontend/src/types/workspace/workspaceState.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { ImageDimensions } from "@/types/image/imageDimensions";
-import type { Timer } from "@/utils/timer";
-import type { Point } from "@/types/common/point";
-import type { Tool, ToolName } from "@/types/workspace/tools";
-import type { Annotation } from '@/types/workspace/annotation';
-import type { LabelScheme } from '@/types/label/labelScheme';
-import type { Asset } from '@/types/asset/asset';
-import type { Task } from '@/types/task';
-import type { WorkflowStageType } from '@/types/workflow/workflowstage';
-
-export interface WorkspaceState {
-    currentProjectId: string | null;
-    currentAssetId: string | null;
-    currentAssetData: Asset | null;
-    currentImageUrl: string | null;
-    imageNaturalDimensions: ImageDimensions | null;
-    canvasDisplayDimensions: ImageDimensions | null;
-    timerInstance: Timer;
-    elapsedTimeDisplay: string;
-    timerIntervalId: number | null;
-    lastSavedWorkingTime: number;
-    viewOffset: Point
-    zoomLevel: number;
-    activeTool: ToolName;
-    availableTools: Tool[];
-    annotations: Annotation[];
-    currentLabelId: number | null;
-    currentLabelScheme: LabelScheme | null;
-    availableLabelSchemes: LabelScheme[];
-    currentTaskId: number | null;
-    currentTaskData: Task | null;
-    currentWorkflowStageType: WorkflowStageType | null;
-    availableTasks: Task[];
-    initialTaskId: number | null;
-    isLoading: boolean;
-    error: string | null;
-}
diff --git a/frontend/src/utils/charts.ts b/frontend/src/utils/charts.ts
deleted file mode 100644
index 2823ebde..00000000
--- a/frontend/src/utils/charts.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// Chart animation utilities
-export const animateValue = (
-    start: number,
-    end: number,
-    duration: number,
-    callback: (value: number) => void
-) => {
-    let startTime: number | null = null;
-
-    const animate = (currentTime: number) => {
-        if (!startTime) startTime = currentTime;
-        
-        const timeElapsed = currentTime - startTime;
-        const progress = Math.min(timeElapsed / duration, 1);
-        
-        // Easing function for smooth animation
-        const easeOutCubic = 1 - Math.pow(1 - progress, 3);
-        const currentValue = start + (end - start) * easeOutCubic;
-        
-        callback(Math.round(currentValue));
-        
-        if (progress < 1) {
-            requestAnimationFrame(animate);
-        }
-    };
-
-    requestAnimationFrame(animate);
-};
-
-export const formatNumber = (num: number): string => {
-    if (num >= 1000000) {
-        return (num / 1000000).toFixed(1) + 'M';
-    }
-    if (num >= 1000) {
-        return (num / 1000).toFixed(1) + 'K';
-    }
-    return num.toString();
-};
diff --git a/frontend/src/views/AnnotationWorkspace.vue b/frontend/src/views/AnnotationWorkspace.vue
index a815a8b4..d94169d7 100644
--- a/frontend/src/views/AnnotationWorkspace.vue
+++ b/frontend/src/views/AnnotationWorkspace.vue
@@ -141,7 +141,7 @@ import ModalWindow from "@/components/common/modal/ModalWindow.vue";
 import {FontAwesomeIcon} from "@fortawesome/vue-fontawesome";
 import {faPause, faForward, faUndo} from "@fortawesome/free-solid-svg-icons";
 import {usePermissions} from "@/composables/usePermissions";
-import {PERMISSIONS} from "@/types/permissions";
+import {PERMISSIONS} from "@/services/auth/permissions.types";
 
 const props = defineProps({
     projectId: {
diff --git a/frontend/src/views/ProjectView.vue b/frontend/src/views/ProjectView.vue
index 38e67a1f..ada022e5 100644
--- a/frontend/src/views/ProjectView.vue
+++ b/frontend/src/views/ProjectView.vue
@@ -48,14 +48,14 @@ import ProjectCard from '@/components/project/ProjectCard.vue';
 import ModalWindow from '@/components/common/modal/ModalWindow.vue';
 import CreateProjectForm from '@/components/project/CreateProjectForm.vue';
 import Button from '@/components/common/Button.vue';
-import type {Project} from '@/types/project/project';
-import {ProjectType} from '@/types/project/project';
-import {projectService} from '@/services/api/projects';
-import type {CreateProjectRequest} from '@/types/project/requests';
+import type {Project} from '@/services/project/project.types';
+import {ProjectType} from '@/services/project/project.types';
+import {projectService} from '@/services/project';
+import type {CreateProjectRequest} from '@/services/project/project.types';
 import {useToast} from '@/composables/useToast';
 import {usePermissions} from '@/composables/usePermissions';
-import { PERMISSIONS } from '@/types/permissions';
-import {AppLogger} from '@/utils/logger';
+import { PERMISSIONS } from '@/services/auth/permissions.types';
+import {AppLogger} from '@/core/logger/logger';
 
 const logger = AppLogger.createComponentLogger('ProjectView');
 
diff --git a/frontend/src/views/account/ChangePasswordView.vue b/frontend/src/views/account/ChangePasswordView.vue
index 5eaa85de..eefc559c 100644
--- a/frontend/src/views/account/ChangePasswordView.vue
+++ b/frontend/src/views/account/ChangePasswordView.vue
@@ -103,8 +103,8 @@ import Card from '@/components/common/Card.vue';
 import Form from '@/components/common/Form.vue';
 import Button from '@/components/common/Button.vue';
 import { authService } from '@/services/auth/authService';
-import type { ChangePasswordDto } from '@/types/auth/auth';
-import { AppLogger } from '@/utils/logger';
+import type { ChangePasswordDto } from '@/services/auth/auth.types';
+import { AppLogger } from '@/core/logger/logger';
 
 const logger = AppLogger.createComponentLogger('ChangePasswordView');
 
diff --git a/frontend/src/views/auth/EmailVerificationView.vue b/frontend/src/views/auth/EmailVerificationView.vue
index c2d7c848..2a6c27a1 100644
--- a/frontend/src/views/auth/EmailVerificationView.vue
+++ b/frontend/src/views/auth/EmailVerificationView.vue
@@ -49,7 +49,7 @@
 import { ref, onMounted } from "vue";
 import { useRoute } from "vue-router";
 import { useAuthStore } from "@/stores/authStore";
-import { AppLogger } from "@/utils/logger";
+import { AppLogger } from "@/core/logger/logger";
 
 const logger = AppLogger.createComponentLogger('EmailVerificationView');
 
diff --git a/frontend/src/views/auth/InviteAcceptView.vue b/frontend/src/views/auth/InviteAcceptView.vue
index f0666f8f..b1e828cb 100644
--- a/frontend/src/views/auth/InviteAcceptView.vue
+++ b/frontend/src/views/auth/InviteAcceptView.vue
@@ -91,12 +91,12 @@ import {computed, onMounted, ref} from "vue";
 import {useRoute, useRouter} from "vue-router";
 import {useAuthStore} from "@/stores/authStore";
 import {useToast} from "@/composables/useToast";
-import {projectInvitationService} from "@/services/api";
-import {projectService} from "@/services/api/projects";
+import {invitationService} from "@/services/invitation";
+import {projectService} from "@/services/project";
 import Button from "@/components/common/Button.vue";
-import type {ProjectInvitationDto} from "@/types/projectInvitation";
-import type {Project} from "@/types/project/project";
-import {AppLogger} from "@/utils/logger";
+import type {ProjectInvitationDto} from "@/services/invitation/invitation.types";
+import type {Project} from "@/services/project/project.types";
+import {AppLogger} from "@/core/logger/logger";
 
 const logger = AppLogger.createComponentLogger('InviteAcceptView');
 
@@ -133,7 +133,7 @@ const validateInvitationToken = async (token: string): Promise<void> => {
     errorMessage.value = "";
     
     try {
-        const invitation = await projectInvitationService.validateInvitationToken(token);
+        const invitation = await invitationService.validateInvitationToken(token);
         invitationData.value = invitation;
         
         // Fetch project details to get the project name
@@ -167,7 +167,7 @@ const handleAcceptInvitation = async (): Promise<void> => {
     errorMessage.value = "";
     
     try {
-        await projectInvitationService.acceptInvitation(inviteToken.value);
+        await invitationService.acceptInvitation(inviteToken.value);
         isAccepted.value = true;
         showSuccess("Invitation Accepted", "You have successfully joined the project!");
     } catch (error) {
diff --git a/frontend/src/views/auth/LoginView.vue b/frontend/src/views/auth/LoginView.vue
index 1e60725d..f492f427 100644
--- a/frontend/src/views/auth/LoginView.vue
+++ b/frontend/src/views/auth/LoginView.vue
@@ -72,7 +72,7 @@ import {useAuthStore} from "@/stores/authStore";
 import {useToast} from "@/composables/useToast";
 import Button from "@/components/common/Button.vue";
 import Form from "@/components/common/Form.vue";
-import {AppLogger} from "@/utils/logger";
+import {AppLogger} from "@/core/logger/logger";
 
 const logger = AppLogger.createComponentLogger('LoginView');
 
diff --git a/frontend/src/views/auth/RegisterView.vue b/frontend/src/views/auth/RegisterView.vue
index c8ebe2f3..c8fddf23 100644
--- a/frontend/src/views/auth/RegisterView.vue
+++ b/frontend/src/views/auth/RegisterView.vue
@@ -122,11 +122,11 @@ import {computed, onMounted, ref} from "vue";
 import {useRouter} from "vue-router";
 import {useAuthStore} from "@/stores/authStore";
 import {useToast} from "@/composables/useToast";
-import {projectInvitationService} from "@/services/api";
+import {invitationService} from "@/services/invitation";
 import Button from "@/components/common/Button.vue";
 import Form from "@/components/common/Form.vue";
-import type {ProjectInvitationDto} from "@/types/projectInvitation";
-import {AppLogger} from "@/utils/logger";
+import type {ProjectInvitationDto} from "@/services/invitation/invitation.types";
+import {AppLogger} from "@/core/logger/logger";
 
 const logger = AppLogger.createComponentLogger('RegisterView');
 
@@ -176,7 +176,7 @@ const validateInvitationToken = async (token: string): Promise<void> => {
     isValidatingToken.value = true;
     
     try {
-        const invitation = await projectInvitationService.validateInvitationToken(token);
+        const invitation = await invitationService.validateInvitationToken(token);
         invitationData.value = invitation;
         
         // Pre-fill email if invitation exists
diff --git a/frontend/src/views/dataExplorer/DataExplorerView.vue b/frontend/src/views/dataExplorer/DataExplorerView.vue
index 7b69bfcb..ccb4a13f 100644
--- a/frontend/src/views/dataExplorer/DataExplorerView.vue
+++ b/frontend/src/views/dataExplorer/DataExplorerView.vue
@@ -138,17 +138,17 @@ import {computed, onMounted, ref} from 'vue';
 import {useRoute, useRouter} from 'vue-router';
 import {FontAwesomeIcon} from '@fortawesome/vue-fontawesome';
 import {faHome} from '@fortawesome/free-solid-svg-icons';
-import {type Asset, type AssetListParams} from '@/types/asset';
-import {AssetStatus} from '@/types/asset';
-import type {DataSource} from '@/types/dataSource';
+import type {DataSource} from '@/services/project/dataSource/dataSource.types';
 import AssetThumbnail from '@/components/project/AssetThumbnail.vue';
 import Button from '@/components/common/Button.vue';
 import UploadImagesModal from '@/components/project/UploadImagesModal.vue';
-import {assetService, dataSourceService} from '@/services/api/projects';
+import {assetService, dataSourceService} from '@/services/project';
 import {useAlert} from '@/composables/useAlert';
-import {AppLogger} from '@/utils/logger';
+import {AppLogger} from '@/core/logger/logger';
 import {usePermissions} from '@/composables/usePermissions';
-import {PERMISSIONS} from '@/types/permissions';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
+import { AssetStatus, type Asset } from '@/core/asset/asset.types';
+import type { AssetListParams } from '@/services/project/asset';
 
 const logger = AppLogger.createComponentLogger('DataExplorerView');
 const route = useRoute();
diff --git a/frontend/src/views/project/DataSourcesView.vue b/frontend/src/views/project/DataSourcesView.vue
index 2710a083..a70c855f 100644
--- a/frontend/src/views/project/DataSourcesView.vue
+++ b/frontend/src/views/project/DataSourcesView.vue
@@ -57,12 +57,12 @@ import DataSourceCard from '@/components/project/dataSource/DataSourceCard.vue';
 import ModalWindow from '@/components/common/modal/ModalWindow.vue';
 import CreateDataSourceForm from '@/components/project/dataSource/CreateDataSourceForm.vue';
 import FloatingActionButton from '@/components/common/FloatingActionButton.vue';
-import {type CreateDataSourceRequest, type DataSource} from '@/types/dataSource';
-import {dataSourceService} from '@/services/api/projects';
+import {type CreateDataSourceRequest, type DataSource} from '@/services/project/dataSource/dataSource.types';
+import {dataSourceService} from '@/services/project';
 import {useAlert} from '@/composables/useAlert';
-import {AppLogger} from '@/utils/logger';
+import {AppLogger} from '@/core/logger/logger';
 import {usePermissions} from '@/composables/usePermissions';
-import {PERMISSIONS} from '@/types/permissions';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
 
 const logger = AppLogger.createComponentLogger('DataSourcesView');
 const route = useRoute();
diff --git a/frontend/src/views/project/LabelSchemesView.vue b/frontend/src/views/project/LabelSchemesView.vue
index a30c0b1a..a197dce7 100644
--- a/frontend/src/views/project/LabelSchemesView.vue
+++ b/frontend/src/views/project/LabelSchemesView.vue
@@ -86,12 +86,12 @@ import CreateLabelSchemeForm from '@/components/project/labels/CreateLabelScheme
 import DeletionImpactDialog from '@/components/project/labels/DeletionImpactDialog.vue';
 import FloatingActionButton from '@/components/common/FloatingActionButton.vue';
 import Button from '@/components/common/Button.vue';
-import type {FormPayloadLabelScheme, LabelScheme, LabelSchemeDeletionImpact} from '@/types/label/labelScheme';
-import {labelSchemeService, labelService} from '@/services/api/projects';
+import type {FormPayloadLabelScheme, LabelScheme, LabelSchemeDeletionImpact} from '@/services/project/labelScheme/label.types';
+import {labelSchemeService, labelService} from '@/services/project';
 import {useAlert} from '@/composables/useAlert';
 import {useToast} from '@/composables/useToast';
-import {AppLogger} from '@/utils/logger';
-import {PERMISSIONS} from '@/types/permissions';
+import {AppLogger} from '@/core/logger/logger';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
 
 const logger = AppLogger.createComponentLogger('LabelSchemesView');
 
diff --git a/frontend/src/views/project/ProjectDashboardView.vue b/frontend/src/views/project/ProjectDashboardView.vue
index ad4cb284..711ca3c2 100644
--- a/frontend/src/views/project/ProjectDashboardView.vue
+++ b/frontend/src/views/project/ProjectDashboardView.vue
@@ -118,7 +118,7 @@ import Button from "@/components/common/Button.vue";
 import { useDashboardStore } from "@/stores/dashboardStore";
 import { useProjectStore } from "@/stores/projectStore";
 import { useErrorHandler } from "@/composables/useErrorHandler";
-import { AppLogger } from "@/utils/logger";
+import { AppLogger } from "@/core/logger/logger";
 
 // Props (from router)
 interface Props {
diff --git a/frontend/src/views/project/ProjectDetailView.vue b/frontend/src/views/project/ProjectDetailView.vue
index 1ea46d54..27e82b3b 100644
--- a/frontend/src/views/project/ProjectDetailView.vue
+++ b/frontend/src/views/project/ProjectDetailView.vue
@@ -79,11 +79,11 @@
 <script setup lang="ts">
 import {onMounted, ref} from 'vue';
 import {useRoute, useRouter} from 'vue-router';
-import type {Project} from '@/types/project/project';
-import {projectService} from '@/services/api/projects';
+import type {Project} from '@/services/project/project.types';
+import {projectService} from '@/services/project';
 import {useAlert} from '@/composables/useAlert';
-import {AppLogger} from '@/utils/logger';
-import {PERMISSIONS} from '@/types/permissions';
+import {AppLogger} from '@/core/logger/logger';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
 
 const logger = AppLogger.createComponentLogger('ProjectDetailView');
 
diff --git a/frontend/src/views/project/ProjectSettingsView.vue b/frontend/src/views/project/ProjectSettingsView.vue
index 8e24d6b4..a6c069b6 100644
--- a/frontend/src/views/project/ProjectSettingsView.vue
+++ b/frontend/src/views/project/ProjectSettingsView.vue
@@ -24,7 +24,7 @@ import {computed} from 'vue';
 import {useRoute} from 'vue-router';
 import MembersSection from '@/components/project/settings/MembersSection.vue';
 import {usePermissions} from '@/composables/usePermissions';
-import {PERMISSIONS} from '@/types/permissions';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
 
 const route = useRoute();
 const { hasProjectPermission } = usePermissions();
diff --git a/frontend/src/views/project/TasksView.vue b/frontend/src/views/project/TasksView.vue
index 7c0de12b..519627c7 100644
--- a/frontend/src/views/project/TasksView.vue
+++ b/frontend/src/views/project/TasksView.vue
@@ -197,19 +197,19 @@ import TaskAssignModal from '@/components/project/task/TaskAssignModal.vue';
 import TaskPriorityModal from '@/components/project/task/TaskPriorityModal.vue';
 import TaskSelectionColumn from '@/components/project/task/TaskSelectionColumn.vue';
 import TaskBulkOperationsToolbar from '@/components/project/task/TaskBulkOperationsToolbar.vue';
-import type {TaskTableRow} from '@/types/task';
-import {TaskStatus} from '@/types/task';
-import type {TableColumn, TableRowAction} from '@/types/common';
-import {useErrorHandler} from '@/composables/useErrorHandler';
-import {usePermissions} from '@/composables/usePermissions';
-import {useAssetPreview} from '@/composables/useAssetPreview';
-import {PERMISSIONS} from '@/types/permissions';
-import {useProjectStore} from '@/stores/projectStore';
-import {taskService, workflowStageService, assetService} from '@/services/api/projects';
-import {useTaskSelection} from '@/composables/useTaskSelection';
-import {taskBulkOperations} from '@/services/taskBulkOperations';
-import {LastStageManager} from '@/core/storage';
-import {AppLogger} from '@/utils/logger';
+import type { TaskTableRow } from '@/services/project/task/task.types';
+import { TaskStatus } from '@/services/project/task/task.types';
+import type { TableColumn, TableRowAction } from '@/core/table/table.types';
+import { useErrorHandler } from '@/composables/useErrorHandler';
+import { usePermissions } from '@/composables/usePermissions';
+import { useAssetPreview } from '@/composables/useAssetPreview';
+import { PERMISSIONS } from '@/services/auth/permissions.types';
+import { useProjectStore } from '@/stores/projectStore';
+import { taskService, workflowStageService, assetService } from '@/services/project';
+import { useTaskSelection } from '@/composables/useTaskSelection';
+import { taskBulkOperations } from '@/services/project';
+import { LastStageManager } from '@/core/persistence';
+import { AppLogger } from '@/core/logger/logger';
 
 const route = useRoute();
 const router = useRouter();
diff --git a/frontend/src/views/project/WorkflowPipelineView.vue b/frontend/src/views/project/WorkflowPipelineView.vue
index 4e9dbc57..352f5a52 100644
--- a/frontend/src/views/project/WorkflowPipelineView.vue
+++ b/frontend/src/views/project/WorkflowPipelineView.vue
@@ -52,12 +52,13 @@ import {useRoute, useRouter} from 'vue-router';
 import WorkflowPipelineViewer from '@/components/project/workflow/WorkflowPipelineViewer.vue';
 import StageAssignmentModal from '@/components/project/workflow/StageAssignmentModal.vue';
 import StageEditModal from '@/components/project/workflow/StageEditModal.vue';
-import type {WorkflowStagePipeline, WorkflowStage, WorkflowStageConnection} from '@/types/workflow';
-import {workflowStageService} from '@/services/api/projects';
+import type {WorkflowStagePipeline, WorkflowStageConnection} from '@/services/project/workflow/workflowStage.types';
+import type {WorkflowStage} from '@/services/project/workflow/workflowStage.types';
+import {workflowStageService} from '@/services/project';
 import {useErrorHandler} from '@/composables/useErrorHandler';
 import {usePermissions} from '@/composables/usePermissions';
-import {PERMISSIONS} from '@/types/permissions';
-import {AppLogger} from '@/utils/logger';
+import {PERMISSIONS} from '@/services/auth/permissions.types';
+import {AppLogger} from '@/core/logger/logger';
 
 const logger = AppLogger.createComponentLogger('WorkflowPipelineView');
 const route = useRoute();
@@ -107,7 +108,7 @@ const loadPipelineData = async () => {
         );
         
         workflowName.value = workflowWithStages.name;
-        
+
         // Transform WorkflowStage[] to WorkflowStagePipeline[]
         pipelineStages.value = workflowWithStages.stages.map((stage: WorkflowStage) => ({
             id: stage.id,
diff --git a/frontend/src/views/project/WorkflowsView.vue b/frontend/src/views/project/WorkflowsView.vue
index ad33e3bd..1add59f0 100644
--- a/frontend/src/views/project/WorkflowsView.vue
+++ b/frontend/src/views/project/WorkflowsView.vue
@@ -48,16 +48,17 @@ import WorkflowCard from '@/components/project/workflow/WorkflowCard.vue';
 import ModalWindow from '@/components/common/modal/ModalWindow.vue';
 import CreateWorkflowWizard from '@/components/project/workflow/CreateWorkflowWizard.vue';
 import FloatingActionButton from '@/components/common/FloatingActionButton.vue';
-import {type CreateWorkflowWithStagesRequest, type Workflow, type WorkflowStage} from '@/types/workflow';
-import {type ProjectRole} from '@/types/project/project';
-import {workflowService} from '@/services/api/projects/workflowService';
-import {workflowStageService} from '@/services/api/projects/workflowStageService';
-import {projectMemberService} from '@/services/api/projects';
+import {type CreateWorkflowWithStagesRequest, type Workflow} from '@/services/project/workflow/workflow.types';
+import {type WorkflowStage} from '@/services/project/workflow/workflowStage.types';
+import {type ProjectRole} from '@/services/project/project.types';
+import {workflowService} from '@/services/project/workflow/workflowService';
+import {workflowStageService} from '@/services/project/workflow/workflowStageService';
+import {projectMemberService} from '@/services/project';
 import {useAlert} from '@/composables/useAlert';
-import {AppLogger} from '@/utils/logger';
+import {AppLogger} from '@/core/logger/logger';
 import {useToast} from '@/composables/useToast';
 import {useErrorHandler} from '@/composables/useErrorHandler';
-import { PERMISSIONS } from '@/types/permissions';
+import { PERMISSIONS } from '@/services/auth/permissions.types';
 
 const logger = AppLogger.createComponentLogger('WorkflowsView');
 const route = useRoute();