diff --git a/__tests__/components/KeyValueTable.test.jsx b/__tests__/components/general/KeyValueTable.test.jsx
similarity index 74%
rename from __tests__/components/KeyValueTable.test.jsx
rename to __tests__/components/general/KeyValueTable.test.jsx
index ab03814..c95fd08 100644
--- a/__tests__/components/KeyValueTable.test.jsx
+++ b/__tests__/components/general/KeyValueTable.test.jsx
@@ -1,7 +1,7 @@
 import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 
-import KeyValueTable from "../../src/components/general/KeyValueTable";
+import KeyValueTable from "../../../src/components/general/KeyValueTable";
 
 describe("KeyValueTable", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/Panel.test.jsx b/__tests__/components/general/Panel.test.jsx
similarity index 83%
rename from __tests__/components/Panel.test.jsx
rename to __tests__/components/general/Panel.test.jsx
index 4646cfa..6bc921c 100644
--- a/__tests__/components/Panel.test.jsx
+++ b/__tests__/components/general/Panel.test.jsx
@@ -1,7 +1,7 @@
 import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 
-import Panel from "../../src/components/general/Panel";
+import Panel from "../../../src/components/general/Panel";
 
 describe("Panel", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/ProgressIndicator.test.jsx b/__tests__/components/general/ProgressIndicator.test.jsx
similarity index 71%
rename from __tests__/components/ProgressIndicator.test.jsx
rename to __tests__/components/general/ProgressIndicator.test.jsx
index aee7369..b33f80c 100644
--- a/__tests__/components/ProgressIndicator.test.jsx
+++ b/__tests__/components/general/ProgressIndicator.test.jsx
@@ -1,7 +1,7 @@
 import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 
-import ProgressIndicator from "../../src/components/general/ProgressIndicator";
+import ProgressIndicator from "../../../src/components/general/ProgressIndicator";
 
 describe("ProgressIndicator", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/StatusChip.test.jsx b/__tests__/components/general/StatusChip.test.jsx
similarity index 81%
rename from __tests__/components/StatusChip.test.jsx
rename to __tests__/components/general/StatusChip.test.jsx
index 19f3d85..f443ac1 100644
--- a/__tests__/components/StatusChip.test.jsx
+++ b/__tests__/components/general/StatusChip.test.jsx
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "vitest";
 import { render, screen } from "@testing-library/react";
-import StatusChip from "../../src/components/general/StatusChip";
+import StatusChip from "../../../src/components/general/StatusChip";
 
 describe("Status chip test", () => {
   test("should show label on chip", () => {
diff --git a/__tests__/components/Toolbar.test.jsx b/__tests__/components/general/Toolbar.test.jsx
similarity index 89%
rename from __tests__/components/Toolbar.test.jsx
rename to __tests__/components/general/Toolbar.test.jsx
index 61ef087..f0937b4 100644
--- a/__tests__/components/Toolbar.test.jsx
+++ b/__tests__/components/general/Toolbar.test.jsx
@@ -5,7 +5,7 @@ import { render } from "@testing-library/react";
 
 import { BrowserRouter } from "react-router-dom";
 
-import Toolbar from "../../src/components/general/Toolbar";
+import Toolbar from "../../../src/components/general/Toolbar";
 
 describe("Toolbar", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/CodeWidget.test.jsx b/__tests__/components/job-creation/CodeWidget.test.jsx
similarity index 83%
rename from __tests__/components/CodeWidget.test.jsx
rename to __tests__/components/job-creation/CodeWidget.test.jsx
index b2bd23c..c603a30 100644
--- a/__tests__/components/CodeWidget.test.jsx
+++ b/__tests__/components/job-creation/CodeWidget.test.jsx
@@ -1,7 +1,7 @@
 import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 
-import CodeWidget from "../../src/components/job-creation/CodeWidget";
+import CodeWidget from "../../../src/components/job-creation/CodeWidget";
 
 describe("CodeWidget", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/CreateJobDialog.test.jsx b/__tests__/components/job-creation/CreateJobDialog.test.jsx
similarity index 71%
rename from __tests__/components/CreateJobDialog.test.jsx
rename to __tests__/components/job-creation/CreateJobDialog.test.jsx
index c37d44e..f5dbf3b 100644
--- a/__tests__/components/CreateJobDialog.test.jsx
+++ b/__tests__/components/job-creation/CreateJobDialog.test.jsx
@@ -1,7 +1,7 @@
 import { describe, test } from "vitest";
 //import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
 
-//import CreateJobForm from "../../src/components/job-creation/CreateJobForm";
+//import CreateJobForm from "../../../src/components/job-creation/CreateJobForm";
 
 describe("CreateJobForm", () => {
   test("placeholder", () => {});
diff --git a/__tests__/components/CodePanel.test.jsx b/__tests__/components/job-detail/CodePanel.test.jsx
similarity index 74%
rename from __tests__/components/CodePanel.test.jsx
rename to __tests__/components/job-detail/CodePanel.test.jsx
index d86962a..33e054f 100644
--- a/__tests__/components/CodePanel.test.jsx
+++ b/__tests__/components/job-detail/CodePanel.test.jsx
@@ -1,7 +1,7 @@
 import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 
-import CodePanel from "../../src/components/job-detail/CodePanel";
+import CodePanel from "../../../src/components/job-detail/CodePanel";
 
 describe("CodePanel", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/CommentsPanel.test.jsx b/__tests__/components/job-detail/CommentsPanel.test.jsx
similarity index 86%
rename from __tests__/components/CommentsPanel.test.jsx
rename to __tests__/components/job-detail/CommentsPanel.test.jsx
index 6745dea..1bf965a 100644
--- a/__tests__/components/CommentsPanel.test.jsx
+++ b/__tests__/components/job-detail/CommentsPanel.test.jsx
@@ -2,7 +2,7 @@ import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
-import CommentsPanel from "../../src/components/job-detail/CommentsPanel";
+import CommentsPanel from "../../../src/components/job-detail/CommentsPanel";
 
 describe("CommentsPanel", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/FilesPanel.test.jsx b/__tests__/components/job-detail/FilesPanel.test.jsx
similarity index 89%
rename from __tests__/components/FilesPanel.test.jsx
rename to __tests__/components/job-detail/FilesPanel.test.jsx
index 191194d..20e4597 100644
--- a/__tests__/components/FilesPanel.test.jsx
+++ b/__tests__/components/job-detail/FilesPanel.test.jsx
@@ -2,7 +2,7 @@ import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
-import FilesPanel from "../../src/components/job-detail/FilesPanel";
+import FilesPanel from "../../../src/components/job-detail/FilesPanel";
 
 describe("FilesPanel", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/JobDetail.test.jsx b/__tests__/components/job-detail/JobDetail.test.jsx
similarity index 94%
rename from __tests__/components/JobDetail.test.jsx
rename to __tests__/components/job-detail/JobDetail.test.jsx
index 12d9431..91379b9 100644
--- a/__tests__/components/JobDetail.test.jsx
+++ b/__tests__/components/job-detail/JobDetail.test.jsx
@@ -2,7 +2,7 @@ import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
-import JobDetailRoute from "../../src/routes/job-detail";
+import JobDetailRoute from "../../../src/routes/job-detail";
 
 describe("JobDetail", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/LogPanel.test.jsx b/__tests__/components/job-detail/LogPanel.test.jsx
similarity index 90%
rename from __tests__/components/LogPanel.test.jsx
rename to __tests__/components/job-detail/LogPanel.test.jsx
index 697dadf..b14a216 100644
--- a/__tests__/components/LogPanel.test.jsx
+++ b/__tests__/components/job-detail/LogPanel.test.jsx
@@ -1,8 +1,8 @@
 import { describe, expect, test, vi } from "vitest";
 import { render, screen, getByRole, fireEvent, waitFor } from "@testing-library/react";
 
-import LogPanel from "../../src/components/job-detail/LogPanel";
-import { getLog } from "../../src/datastore";
+import LogPanel from "../../../src/components/job-detail/LogPanel";
+import { getLog } from "../../../src/datastore";
 
 function wait(time) {
   return new Promise((resolve) => {
@@ -25,7 +25,7 @@ describe("LogPanel", () => {
   });
 
   test("should show the content on click", async () => {
-    vi.mock("../../src/datastore.js", () => {
+    vi.mock("../../../src/datastore.js", () => {
       const promise = new Promise((resolve) => {
         setTimeout(() => {
           resolve("This is the first line of the log.\nThis is the second line.");
diff --git a/__tests__/components/JobList.test.jsx b/__tests__/components/jobs/JobList.test.jsx
similarity index 89%
rename from __tests__/components/JobList.test.jsx
rename to __tests__/components/jobs/JobList.test.jsx
index b3666b9..dfc9475 100644
--- a/__tests__/components/JobList.test.jsx
+++ b/__tests__/components/jobs/JobList.test.jsx
@@ -2,7 +2,7 @@ import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
-import JobListRoute from "../../src/routes/jobs";
+import JobListRoute from "../../../src/routes/jobs";
 
 describe("JobList", () => {
   test("placeholder", () => {
diff --git a/__tests__/components/ProjectList.test.jsx b/__tests__/components/projects
similarity index 88%
rename from __tests__/components/ProjectList.test.jsx
rename to __tests__/components/projects
index 147142c..6704e43 100644
--- a/__tests__/components/ProjectList.test.jsx
+++ b/__tests__/components/projects
@@ -2,7 +2,7 @@ import { describe, test } from "vitest";
 import { render } from "@testing-library/react";
 import { createMemoryRouter, RouterProvider } from "react-router-dom";
 
-import ProjectListRoute from "../../src/routes/projects";
+import ProjectListRoute from "../../../src/routes/projects";
 
 describe("ProjectList", () => {
   test("placeholder", () => {