diff --git a/web/src/components/CaseBuilder/Buses/Buses.tsx b/web/src/components/CaseBuilder/Buses.tsx
similarity index 88%
rename from web/src/components/CaseBuilder/Buses/Buses.tsx
rename to web/src/components/CaseBuilder/Buses.tsx
index ea93362..5f8a585 100644
--- a/web/src/components/CaseBuilder/Buses/Buses.tsx
+++ b/web/src/components/CaseBuilder/Buses.tsx
@@ -4,33 +4,33 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import SectionHeader from "../../Common/SectionHeader/SectionHeader";
-import SectionButton from "../../Common/Buttons/SectionButton";
+import SectionHeader from "../Common/SectionHeader/SectionHeader";
+import SectionButton from "../Common/Buttons/SectionButton";
 import {
   faDownload,
   faPlus,
   faUpload,
 } from "@fortawesome/free-solid-svg-icons";
-import { offerDownload } from "../../Common/io";
-import FileUploadElement from "../../Common/Buttons/FileUploadElement";
+import { offerDownload } from "../Common/io";
+import FileUploadElement from "../Common/Buttons/FileUploadElement";
 import { useRef } from "react";
-import { ValidationError } from "../../../core/Validation/validate";
+import { ValidationError } from "../../core/Validation/validate";
 import DataTable, {
   ColumnSpec,
   generateCsv,
   generateTableColumns,
   generateTableData,
   parseCsv,
-} from "../../Common/Forms/DataTable";
+} from "../Common/Forms/DataTable";
 
-import { UnitCommitmentScenario } from "../../../core/fixtures";
+import { UnitCommitmentScenario } from "../../core/fixtures";
 import { ColumnDefinition } from "tabulator-tables";
 import {
   changeBusData,
   createBus,
   deleteBus,
   renameBus,
-} from "../../../core/Operations/busOps";
+} from "../../core/Operations/busOps";
 
 export const BusesColumnSpec: ColumnSpec[] = [
   {
diff --git a/web/src/components/CaseBuilder/CaseBuilder.tsx b/web/src/components/CaseBuilder/CaseBuilder.tsx
index 8c218cc..66be4de 100644
--- a/web/src/components/CaseBuilder/CaseBuilder.tsx
+++ b/web/src/components/CaseBuilder/CaseBuilder.tsx
@@ -5,8 +5,8 @@
  */
 
 import Header from "./Header";
-import Parameters from "./Parameters/Parameters";
-import Buses from "./Buses/Buses";
+import Parameters from "./Parameters";
+import Buses from "./Buses";
 import {
   BLANK_SCENARIO,
   TEST_SCENARIO,
@@ -21,7 +21,7 @@ import { validate } from "../../core/Validation/validate";
 import { offerDownload } from "../Common/io";
 import { preprocess } from "../../core/Operations/preprocessing";
 import Toast from "../Common/Forms/Toast";
-import ProfiledUnitsComponent from "./ProfiledUnits/ProfiledUnits";
+import ProfiledUnitsComponent from "./ProfiledUnits";
 
 const CaseBuilder = () => {
   const [scenario, setScenario] = useState(() => {
diff --git a/web/src/components/CaseBuilder/Parameters/Parameters.tsx b/web/src/components/CaseBuilder/Parameters.tsx
similarity index 88%
rename from web/src/components/CaseBuilder/Parameters/Parameters.tsx
rename to web/src/components/CaseBuilder/Parameters.tsx
index c4e031c..f0009c8 100644
--- a/web/src/components/CaseBuilder/Parameters/Parameters.tsx
+++ b/web/src/components/CaseBuilder/Parameters.tsx
@@ -4,15 +4,15 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import SectionHeader from "../../Common/SectionHeader/SectionHeader";
-import Form from "../../Common/Forms/Form";
-import TextInputRow from "../../Common/Forms/TextInputRow";
-import { UnitCommitmentScenario } from "../../../core/fixtures";
+import SectionHeader from "../Common/SectionHeader/SectionHeader";
+import Form from "../Common/Forms/Form";
+import TextInputRow from "../Common/Forms/TextInputRow";
+import { UnitCommitmentScenario } from "../../core/fixtures";
 import {
   changeParameter,
   changeTimeHorizon,
   changeTimeStep,
-} from "../../../core/Operations/parameterOps";
+} from "../../core/Operations/parameterOps";
 
 interface ParametersProps {
   scenario: UnitCommitmentScenario;
diff --git a/web/src/components/CaseBuilder/ProfiledUnits/ProfiledUnits.tsx b/web/src/components/CaseBuilder/ProfiledUnits.tsx
similarity index 89%
rename from web/src/components/CaseBuilder/ProfiledUnits/ProfiledUnits.tsx
rename to web/src/components/CaseBuilder/ProfiledUnits.tsx
index 24db9e3..f0ade66 100644
--- a/web/src/components/CaseBuilder/ProfiledUnits/ProfiledUnits.tsx
+++ b/web/src/components/CaseBuilder/ProfiledUnits.tsx
@@ -4,8 +4,8 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import SectionHeader from "../../Common/SectionHeader/SectionHeader";
-import SectionButton from "../../Common/Buttons/SectionButton";
+import SectionHeader from "../Common/SectionHeader/SectionHeader";
+import SectionButton from "../Common/Buttons/SectionButton";
 import {
   faDownload,
   faPlus,
@@ -17,19 +17,19 @@ import DataTable, {
   generateTableColumns,
   generateTableData,
   parseCsv,
-} from "../../Common/Forms/DataTable";
-import { UnitCommitmentScenario } from "../../../core/fixtures";
+} from "../Common/Forms/DataTable";
+import { UnitCommitmentScenario } from "../../core/fixtures";
 import { ColumnDefinition } from "tabulator-tables";
-import { offerDownload } from "../../Common/io";
-import FileUploadElement from "../../Common/Buttons/FileUploadElement";
+import { offerDownload } from "../Common/io";
+import FileUploadElement from "../Common/Buttons/FileUploadElement";
 import { useRef } from "react";
 import {
   changeProfiledUnitData,
   createProfiledUnit,
   deleteGenerator,
   renameGenerator,
-} from "../../../core/Operations/generatorOps";
-import { ValidationError } from "../../../core/Validation/validate";
+} from "../../core/Operations/generatorOps";
+import { ValidationError } from "../../core/Validation/validate";
 
 interface ProfiledUnitsProps {
   scenario: UnitCommitmentScenario;
diff --git a/web/src/components/Common/Forms/DataTable.test.ts b/web/src/components/Common/Forms/DataTable.test.ts
index 4060908..05a0793 100644
--- a/web/src/components/Common/Forms/DataTable.test.ts
+++ b/web/src/components/Common/Forms/DataTable.test.ts
@@ -5,13 +5,10 @@
  */
 
 import assert from "node:assert";
-import {
-  BusesColumnSpec,
-  generateBusesData,
-} from "../../CaseBuilder/Buses/Buses";
+import { BusesColumnSpec, generateBusesData } from "../../CaseBuilder/Buses";
 import { generateCsv, parseCsv } from "./DataTable";
 import { TEST_DATA_1 } from "../../../core/fixtures.test";
-import { ProfiledUnitsColumnSpec } from "../../CaseBuilder/ProfiledUnits/ProfiledUnits";
+import { ProfiledUnitsColumnSpec } from "../../CaseBuilder/ProfiledUnits";
 
 test("generate CSV", () => {
   const [data, columns] = generateBusesData(TEST_DATA_1);
diff --git a/web/src/core/Operations/busOps.ts b/web/src/core/Operations/busOps.ts
index a37874c..db98f15 100644
--- a/web/src/core/Operations/busOps.ts
+++ b/web/src/core/Operations/busOps.ts
@@ -12,7 +12,7 @@ import {
   generateUniqueName,
   renameItemInObject,
 } from "./commonOps";
-import { BusesColumnSpec } from "../../components/CaseBuilder/Buses/Buses";
+import { BusesColumnSpec } from "../../components/CaseBuilder/Buses";
 
 export const createBus = (scenario: UnitCommitmentScenario) => {
   const name = generateUniqueName(scenario.Buses, "b");
diff --git a/web/src/core/Operations/generatorOps.ts b/web/src/core/Operations/generatorOps.ts
index e99535a..bac9607 100644
--- a/web/src/core/Operations/generatorOps.ts
+++ b/web/src/core/Operations/generatorOps.ts
@@ -12,7 +12,7 @@ import {
   generateUniqueName,
   renameItemInObject,
 } from "./commonOps";
-import { ProfiledUnitsColumnSpec } from "../../components/CaseBuilder/ProfiledUnits/ProfiledUnits";
+import { ProfiledUnitsColumnSpec } from "../../components/CaseBuilder/ProfiledUnits";
 
 export const createProfiledUnit = (
   scenario: UnitCommitmentScenario,