diff --git a/plugin/src/api/domain/section.ts b/plugin/src/api/domain/section.ts
index 5bb3d22..10e7047 100644
--- a/plugin/src/api/domain/section.ts
+++ b/plugin/src/api/domain/section.ts
@@ -1,4 +1,4 @@
-import type { ProjectId } from "./project";
+import type { ProjectId } from "@/api/domain/project";
 
 export type SectionId = string;
 
diff --git a/plugin/src/api/domain/task.ts b/plugin/src/api/domain/task.ts
index 4dbcfc1..bbbf225 100644
--- a/plugin/src/api/domain/task.ts
+++ b/plugin/src/api/domain/task.ts
@@ -1,6 +1,6 @@
-import type { DueDate } from "./dueDate";
-import type { ProjectId } from "./project";
-import type { SectionId } from "./section";
+import type { DueDate } from "@/api/domain/dueDate";
+import type { ProjectId } from "@/api/domain/project";
+import type { SectionId } from "@/api/domain/section";
 
 export type TaskId = string;
 
diff --git a/plugin/src/api/index.ts b/plugin/src/api/index.ts
index 35ec5ee..6307684 100644
--- a/plugin/src/api/index.ts
+++ b/plugin/src/api/index.ts
@@ -1,11 +1,11 @@
+import type { Label } from "@/api/domain/label";
+import type { Project } from "@/api/domain/project";
+import type { Section } from "@/api/domain/section";
+import type { CreateTaskParams, Task, TaskId } from "@/api/domain/task";
+import type { RequestParams, WebFetcher, WebResponse } from "@/api/fetcher";
+import debug from "@/log";
 import camelize from "camelize-ts";
 import snakify from "snakify-ts";
-import debug from "../log";
-import type { Label } from "./domain/label";
-import type { Project } from "./domain/project";
-import type { Section } from "./domain/section";
-import type { CreateTaskParams, Task, TaskId } from "./domain/task";
-import type { RequestParams, WebFetcher, WebResponse } from "./fetcher";
 
 export class TodoistApiClient {
   private token: string;
diff --git a/plugin/src/commands/addTask.ts b/plugin/src/commands/addTask.ts
index 1ef38a9..fb6a098 100644
--- a/plugin/src/commands/addTask.ts
+++ b/plugin/src/commands/addTask.ts
@@ -1,8 +1,8 @@
+import type { MakeCommand } from "@/commands";
 import type { Translations } from "@/i18n/translation";
-import { MarkdownView, Notice, type TFile } from "obsidian";
-import type { MakeCommand } from ".";
-import type TodoistPlugin from "..";
-import type { TaskCreationOptions } from "../ui/createTaskModal";
+import type TodoistPlugin from "@/index";
+import type { TaskCreationOptions } from "@/ui/createTaskModal";
+import { MarkdownView, type TFile } from "obsidian";
 
 export const addTask: MakeCommand = (plugin: TodoistPlugin, i18n: Translations["commands"]) => {
   return {
diff --git a/plugin/src/commands/index.ts b/plugin/src/commands/index.ts
index 6f120d3..579cf2c 100644
--- a/plugin/src/commands/index.ts
+++ b/plugin/src/commands/index.ts
@@ -1,9 +1,13 @@
+import {
+  addTask,
+  addTaskWithPageInContent,
+  addTaskWithPageInDescription,
+} from "@/commands/addTask";
 import { t } from "@/i18n";
 import type { Translations } from "@/i18n/translation";
+import type TodoistPlugin from "@/index";
+import debug from "@/log";
 import type { Command as ObsidianCommand } from "obsidian";
-import type TodoistPlugin from "..";
-import debug from "../log";
-import { addTask, addTaskWithPageInContent, addTaskWithPageInDescription } from "./addTask";
 
 export type MakeCommand = (
   plugin: TodoistPlugin,
diff --git a/plugin/src/data/dueDateInfo.test.ts b/plugin/src/data/dueDateInfo.test.ts
index 35c3fb4..e45f8c9 100644
--- a/plugin/src/data/dueDateInfo.test.ts
+++ b/plugin/src/data/dueDateInfo.test.ts
@@ -1,6 +1,6 @@
+import type { DueDate } from "@/api/domain/dueDate";
+import { DueDateInfo } from "@/data/dueDateInfo";
 import { describe, expect, it, vi } from "vitest";
-import type { DueDate } from "../api/domain/dueDate";
-import { DueDateInfo } from "./dueDateInfo";
 
 vi.mock("../now.ts", () => {
   return {
diff --git a/plugin/src/data/dueDateInfo.ts b/plugin/src/data/dueDateInfo.ts
index 4dc64be..e94a5fb 100644
--- a/plugin/src/data/dueDateInfo.ts
+++ b/plugin/src/data/dueDateInfo.ts
@@ -1,6 +1,6 @@
+import type { DueDate } from "@/api/domain/dueDate";
+import { now } from "@/now";
 import moment from "moment";
-import type { DueDate } from "../api/domain/dueDate";
-import { now } from "../now";
 
 export class DueDateInfo {
   private m: moment.Moment | undefined;
diff --git a/plugin/src/data/index.ts b/plugin/src/data/index.ts
index 04c55fd..7d92d86 100644
--- a/plugin/src/data/index.ts
+++ b/plugin/src/data/index.ts
@@ -1,12 +1,12 @@
-import { type TodoistApiClient, TodoistApiError } from "../api";
-import type { Label, LabelId } from "../api/domain/label";
-import type { Project, ProjectId } from "../api/domain/project";
-import type { Section, SectionId } from "../api/domain/section";
-import type { Task as ApiTask, CreateTaskParams, TaskId } from "../api/domain/task";
-import { Maybe } from "../utils/maybe";
-import { Repository, type RepositoryReader } from "./repository";
-import { SubscriptionManager, type UnsubscribeCallback } from "./subscriptions";
-import type { Task } from "./task";
+import { type TodoistApiClient, TodoistApiError } from "@/api";
+import type { Label, LabelId } from "@/api/domain/label";
+import type { Project, ProjectId } from "@/api/domain/project";
+import type { Section, SectionId } from "@/api/domain/section";
+import type { Task as ApiTask, CreateTaskParams, TaskId } from "@/api/domain/task";
+import { Repository, type RepositoryReader } from "@/data/repository";
+import { SubscriptionManager, type UnsubscribeCallback } from "@/data/subscriptions";
+import type { Task } from "@/data/task";
+import { Maybe } from "@/utils/maybe";
 
 export enum QueryErrorKind {
   BadRequest = 0,
diff --git a/plugin/src/data/task.ts b/plugin/src/data/task.ts
index 21afc2c..16f4a1e 100644
--- a/plugin/src/data/task.ts
+++ b/plugin/src/data/task.ts
@@ -1,8 +1,8 @@
+import type { DueDate } from "@/api/domain/dueDate";
 import type { Label } from "@/api/domain/label";
-import type { DueDate } from "../api/domain/dueDate";
-import type { Project } from "../api/domain/project";
-import type { Section } from "../api/domain/section";
-import type { Priority, TaskId } from "../api/domain/task";
+import type { Project } from "@/api/domain/project";
+import type { Section } from "@/api/domain/section";
+import type { Priority, TaskId } from "@/api/domain/task";
 
 export type Task = {
   id: TaskId;
diff --git a/plugin/src/data/transformations/grouping.test.ts b/plugin/src/data/transformations/grouping.test.ts
index 658bda8..c581e0b 100644
--- a/plugin/src/data/transformations/grouping.test.ts
+++ b/plugin/src/data/transformations/grouping.test.ts
@@ -1,11 +1,11 @@
+import type { DueDate } from "@/api/domain/dueDate";
 import type { Label } from "@/api/domain/label";
+import type { Project } from "@/api/domain/project";
+import type { Section } from "@/api/domain/section";
+import type { Task } from "@/data/task";
+import { type GroupedTasks, groupBy } from "@/data/transformations/grouping";
+import { GroupVariant } from "@/query/query";
 import { describe, expect, it, vi } from "vitest";
-import type { DueDate } from "../../api/domain/dueDate";
-import type { Project } from "../../api/domain/project";
-import type { Section } from "../../api/domain/section";
-import { GroupVariant } from "../../query/query";
-import type { Task } from "../task";
-import { type GroupedTasks, groupBy } from "./grouping";
 
 vi.mock("../../now.ts", () => {
   return {
diff --git a/plugin/src/data/transformations/grouping.ts b/plugin/src/data/transformations/grouping.ts
index 77f75ff..4d86432 100644
--- a/plugin/src/data/transformations/grouping.ts
+++ b/plugin/src/data/transformations/grouping.ts
@@ -1,9 +1,9 @@
-import type { Project } from "../../api/domain/project";
-import type { Section } from "../../api/domain/section";
-import type { Priority } from "../../api/domain/task";
-import { GroupVariant } from "../../query/query";
-import { DueDateInfo } from "../dueDateInfo";
-import type { Task } from "../task";
+import type { Project } from "@/api/domain/project";
+import type { Section } from "@/api/domain/section";
+import type { Priority } from "@/api/domain/task";
+import { DueDateInfo } from "@/data/dueDateInfo";
+import type { Task } from "@/data/task";
+import { GroupVariant } from "@/query/query";
 
 export type GroupedTasks = {
   header: string;
diff --git a/plugin/src/data/transformations/relationships.test.ts b/plugin/src/data/transformations/relationships.test.ts
index efbb1e4..ee0fc42 100644
--- a/plugin/src/data/transformations/relationships.test.ts
+++ b/plugin/src/data/transformations/relationships.test.ts
@@ -1,6 +1,6 @@
+import type { Task } from "@/data/task";
+import { type TaskTree, buildTaskTree } from "@/data/transformations/relationships";
 import { describe, expect, it } from "vitest";
-import type { Task } from "../task";
-import { type TaskTree, buildTaskTree } from "./relationships";
 
 function makeTask(id: string, opts?: Partial<Task>): Task {
   return {
diff --git a/plugin/src/data/transformations/relationships.ts b/plugin/src/data/transformations/relationships.ts
index 480eda5..19f059b 100644
--- a/plugin/src/data/transformations/relationships.ts
+++ b/plugin/src/data/transformations/relationships.ts
@@ -1,5 +1,5 @@
-import type { TaskId } from "../../api/domain/task";
-import type { Task } from "../task";
+import type { TaskId } from "@/api/domain/task";
+import type { Task } from "@/data/task";
 
 export type TaskTree = Task & { children: TaskTree[] };
 
diff --git a/plugin/src/data/transformations/sorting.test.ts b/plugin/src/data/transformations/sorting.test.ts
index 33b9102..0d0da94 100644
--- a/plugin/src/data/transformations/sorting.test.ts
+++ b/plugin/src/data/transformations/sorting.test.ts
@@ -1,7 +1,7 @@
+import type { Task } from "@/data/task";
+import { sortTasks } from "@/data/transformations/sorting";
+import { SortingVariant } from "@/query/query";
 import { describe, expect, it } from "vitest";
-import { SortingVariant } from "../../query/query";
-import type { Task } from "../task";
-import { sortTasks } from "./sorting";
 
 function makeTask(id: string, opts?: Partial<Task>): Task {
   return {
diff --git a/plugin/src/data/transformations/sorting.ts b/plugin/src/data/transformations/sorting.ts
index 9c321b5..47c7cad 100644
--- a/plugin/src/data/transformations/sorting.ts
+++ b/plugin/src/data/transformations/sorting.ts
@@ -1,7 +1,7 @@
+import type { Task } from "@/data//task";
+import { DueDateInfo } from "@/data/dueDateInfo";
+import { SortingVariant } from "@/query/query";
 import moment from "moment";
-import { SortingVariant } from "../../query/query";
-import { DueDateInfo } from "../dueDateInfo";
-import type { Task } from "../task";
 
 export function sortTasks<T extends Task>(tasks: T[], sort: SortingVariant[]) {
   tasks.sort((first, second) => {
diff --git a/plugin/src/index.ts b/plugin/src/index.ts
index 996ff7e..f656224 100644
--- a/plugin/src/index.ts
+++ b/plugin/src/index.ts
@@ -1,14 +1,14 @@
 import { setLanguage } from "@/i18n";
 import "@/styles/main.scss";
+import { TodoistApiClient } from "@/api";
+import { ObsidianFetcher } from "@/api/fetcher";
+import { registerCommands } from "@/commands";
+import { QueryInjector } from "@/query/injector";
+import { type Services, makeServices } from "@/services";
+import { type Settings, useSettingsStore } from "@/settings";
+import { SettingsTab } from "@/ui/settings";
 import { type App, Plugin } from "obsidian";
 import type { PluginManifest } from "obsidian";
-import { TodoistApiClient } from "./api";
-import { ObsidianFetcher } from "./api/fetcher";
-import { registerCommands } from "./commands";
-import { QueryInjector } from "./query/injector";
-import { type Services, makeServices } from "./services";
-import { type Settings, useSettingsStore } from "./settings";
-import { SettingsTab } from "./ui/settings";
 
 export default class TodoistPlugin extends Plugin {
   public readonly services: Services;
diff --git a/plugin/src/query/parser.test.ts b/plugin/src/query/parser.test.ts
index 76fdc94..6cf44df 100644
--- a/plugin/src/query/parser.test.ts
+++ b/plugin/src/query/parser.test.ts
@@ -1,6 +1,6 @@
+import { ParsingError, type QueryWarning, parseQuery } from "@/query/parser";
+import { GroupVariant, type Query, ShowMetadataVariant, SortingVariant } from "@/query/query";
 import { describe, expect, it } from "vitest";
-import { ParsingError, type QueryWarning, parseQuery } from "./parser";
-import { GroupVariant, type Query, ShowMetadataVariant, SortingVariant } from "./query";
 
 describe("parseQuery - rejections", () => {
   type Testcase = {
diff --git a/plugin/src/query/parser.ts b/plugin/src/query/parser.ts
index 9ed1490..0c6b42f 100644
--- a/plugin/src/query/parser.ts
+++ b/plugin/src/query/parser.ts
@@ -1,5 +1,5 @@
+import { GroupVariant, type Query, ShowMetadataVariant, SortingVariant } from "@/query/query";
 import YAML from "yaml";
-import { GroupVariant, type Query, ShowMetadataVariant, SortingVariant } from "./query";
 
 const possibleWarnings: Record<string, string> = {
   JsonQuery:
diff --git a/plugin/src/query/replacements.test.ts b/plugin/src/query/replacements.test.ts
index a933f45..6fe0d29 100644
--- a/plugin/src/query/replacements.test.ts
+++ b/plugin/src/query/replacements.test.ts
@@ -1,11 +1,11 @@
+import { GroupVariant, type Query } from "@/query/query";
+import { applyReplacements } from "@/query/replacements";
 import type {
   MarkdownPostProcessorContext,
   MarkdownRenderChild,
   MarkdownSectionInformation,
 } from "obsidian";
 import { describe, expect, it } from "vitest";
-import { GroupVariant, type Query } from "./query";
-import { applyReplacements } from "./replacements";
 
 class FakeContext implements MarkdownPostProcessorContext {
   docId = "";
diff --git a/plugin/src/query/replacements.ts b/plugin/src/query/replacements.ts
index 92d2fff..96d97a7 100644
--- a/plugin/src/query/replacements.ts
+++ b/plugin/src/query/replacements.ts
@@ -1,5 +1,5 @@
+import type { Query } from "@/query/query";
 import type { MarkdownPostProcessorContext } from "obsidian";
-import type { Query } from "./query";
 
 export function applyReplacements(query: Query, ctx: MarkdownPostProcessorContext) {
   // Replace {filename} with the base file name of file where the query originated.
diff --git a/plugin/src/services/index.ts b/plugin/src/services/index.ts
index 380e5d6..aabd4e6 100644
--- a/plugin/src/services/index.ts
+++ b/plugin/src/services/index.ts
@@ -1,7 +1,7 @@
-import type TodoistPlugin from "..";
-import { TodoistAdapter } from "../data";
-import { ModalHandler } from "./modals";
-import { VaultTokenAccessor } from "./tokenAccessor";
+import { TodoistAdapter } from "@/data";
+import type TodoistPlugin from "@/index";
+import { ModalHandler } from "@/services/modals";
+import { VaultTokenAccessor } from "@/services/tokenAccessor";
 
 export type Services = {
   modals: ModalHandler;
diff --git a/plugin/src/token.ts b/plugin/src/token.ts
index 6256f4a..8c57226 100644
--- a/plugin/src/token.ts
+++ b/plugin/src/token.ts
@@ -1,6 +1,6 @@
+import { TodoistApiClient } from "@/api";
+import { ObsidianFetcher } from "@/api/fetcher";
 import { t } from "@/i18n";
-import { TodoistApiClient } from "./api";
-import { ObsidianFetcher } from "./api/fetcher";
 
 export namespace TokenValidation {
   export type Result =
diff --git a/plugin/src/utils/types.test.ts b/plugin/src/utils/types.test.ts
index bf8dd15..2198593 100644
--- a/plugin/src/utils/types.test.ts
+++ b/plugin/src/utils/types.test.ts
@@ -1,5 +1,5 @@
+import { DeepPartial } from "@/utils/types";
 import { describe, expect, it } from "vitest";
-import { DeepPartial } from "./types";
 
 type TestObject = {
   a: number;