diff --git a/src/pages/task/TaskTabs.tsx b/src/pages/task/TaskTabs.tsx
index e63c9bc4ff..090b0920fa 100644
--- a/src/pages/task/TaskTabs.tsx
+++ b/src/pages/task/TaskTabs.tsx
@@ -11,8 +11,8 @@ import { usePrevious } from "hooks";
 import { useTabShortcut } from "hooks/useTabShortcut";
 import { TaskTab } from "types/task";
 import { queryString } from "utils";
-import { BuildBaron } from "./taskTabs/BuildBaronAndAnnotations";
-import useBuildBaronVariables from "./taskTabs/BuildBaronAndAnnotations/useBuildBaronVariables";
+import { BuildBaron } from "./taskTabs/BuildBaron";
+import { useBuildBaronVariables } from "./taskTabs/buildBaronAndAnnotations";
 import { ExecutionTasksTable } from "./taskTabs/ExecutionTasksTable";
 import FilesTableTab from "./taskTabs/FileTableTab";
 import { Logs } from "./taskTabs/Logs";
diff --git a/src/pages/task/taskTabs/BuildBaron.ts b/src/pages/task/taskTabs/BuildBaron.ts
new file mode 100644
index 0000000000..3d62b6099d
--- /dev/null
+++ b/src/pages/task/taskTabs/BuildBaron.ts
@@ -0,0 +1,5 @@
+import { loadable } from "components/SpruceLoader";
+
+export const BuildBaron = loadable(
+  () => import("./buildBaronAndAnnotations/BuildBaron")
+);
diff --git a/src/pages/task/taskTabs/ExecutionTasksTable/ExecutionTasksTable.stories.tsx b/src/pages/task/taskTabs/ExecutionTasksTable.stories.tsx
similarity index 96%
rename from src/pages/task/taskTabs/ExecutionTasksTable/ExecutionTasksTable.stories.tsx
rename to src/pages/task/taskTabs/ExecutionTasksTable.stories.tsx
index 2662c5df1e..8af0489035 100644
--- a/src/pages/task/taskTabs/ExecutionTasksTable/ExecutionTasksTable.stories.tsx
+++ b/src/pages/task/taskTabs/ExecutionTasksTable.stories.tsx
@@ -1,6 +1,6 @@
 import { CustomStoryObj, CustomMeta } from "test_utils/types";
 
-import { ExecutionTasksTable } from ".";
+import { ExecutionTasksTable } from "./ExecutionTasksTable";
 
 export default {
   title: "Pages/Task/Table/Execution Tasks Table",
diff --git a/src/pages/task/taskTabs/ExecutionTasksTable/index.tsx b/src/pages/task/taskTabs/ExecutionTasksTable.tsx
similarity index 100%
rename from src/pages/task/taskTabs/ExecutionTasksTable/index.tsx
rename to src/pages/task/taskTabs/ExecutionTasksTable.tsx
diff --git a/src/pages/task/taskTabs/logs/index.tsx b/src/pages/task/taskTabs/Logs.tsx
similarity index 98%
rename from src/pages/task/taskTabs/logs/index.tsx
rename to src/pages/task/taskTabs/Logs.tsx
index 30c04ad957..7c85c9f8e4 100644
--- a/src/pages/task/taskTabs/logs/index.tsx
+++ b/src/pages/task/taskTabs/Logs.tsx
@@ -16,7 +16,13 @@ import { size } from "constants/tokens";
 import { TaskLogLinks } from "gql/generated/types";
 import { useUpdateURLQueryParams } from "hooks";
 import { LogTypes, QueryParams } from "types/task";
-import { EventLog, AgentLog, SystemLog, TaskLog, AllLog } from "./LogTypes";
+import {
+  EventLog,
+  AgentLog,
+  SystemLog,
+  TaskLog,
+  AllLog,
+} from "./logs/LogTypes";
 
 const DEFAULT_LOG_TYPE = LogTypes.Task;
 
diff --git a/src/pages/task/taskTabs/testsTable/index.tsx b/src/pages/task/taskTabs/TestsTable.tsx
similarity index 99%
rename from src/pages/task/taskTabs/testsTable/index.tsx
rename to src/pages/task/taskTabs/TestsTable.tsx
index cc7f178adc..462fc0a013 100644
--- a/src/pages/task/taskTabs/testsTable/index.tsx
+++ b/src/pages/task/taskTabs/TestsTable.tsx
@@ -26,7 +26,7 @@ import {
 import { RequiredQueryParams, TableOnChange } from "types/task";
 import { TestStatus } from "types/test";
 import { queryString, url } from "utils";
-import { getColumnsTemplate } from "./getColumnsTemplate";
+import { getColumnsTemplate } from "./testsTable/getColumnsTemplate";
 
 const { getLimitFromSearch, getPageFromSearch } = url;
 const { parseQueryString, queryParamAsNumber } = queryString;
diff --git a/src/pages/task/taskTabs/ExecutionTasksTable/__snapshots__/ExecutionTasksTable.stories.storyshot b/src/pages/task/taskTabs/__snapshots__/ExecutionTasksTable.stories.storyshot
similarity index 100%
rename from src/pages/task/taskTabs/ExecutionTasksTable/__snapshots__/ExecutionTasksTable.stories.storyshot
rename to src/pages/task/taskTabs/__snapshots__/ExecutionTasksTable.stories.storyshot
diff --git a/src/pages/task/taskTabs/buildBaronAndAnnotations/index.ts b/src/pages/task/taskTabs/buildBaronAndAnnotations/index.ts
index 14d0913439..0be0337937 100644
--- a/src/pages/task/taskTabs/buildBaronAndAnnotations/index.ts
+++ b/src/pages/task/taskTabs/buildBaronAndAnnotations/index.ts
@@ -1,3 +1,3 @@
-import { loadable } from "components/SpruceLoader";
+import useBuildBaronVariables from "./useBuildBaronVariables";
 
-export const BuildBaron = loadable(() => import("./BuildBaron"));
+export { useBuildBaronVariables };