diff --git a/web/.gitignore b/web/.gitignore
index 4d29575..8403d31 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -21,3 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+assets
diff --git a/web/src/components/CaseBuilder/Buses/BusesComponent.tsx b/web/src/components/CaseBuilder/BusesComponent.tsx
similarity index 83%
rename from web/src/components/CaseBuilder/Buses/BusesComponent.tsx
rename to web/src/components/CaseBuilder/BusesComponent.tsx
index 7a6bd63..b4983d8 100644
--- a/web/src/components/CaseBuilder/Buses/BusesComponent.tsx
+++ b/web/src/components/CaseBuilder/BusesComponent.tsx
@@ -4,19 +4,19 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import SectionHeader from "../../Common/SectionHeader/SectionHeader";
-import { UnitCommitmentScenario } from "../../../core/data";
+import SectionHeader from "../Common/SectionHeader/SectionHeader";
+import { UnitCommitmentScenario } from "../../core/fixtures";
 import BusesTable, { generateBusesCsv, parseBusesCsv } from "./BusesTable";
-import SectionButton from "../../Common/Buttons/SectionButton";
+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";
 
 interface BusesProps {
   scenario: UnitCommitmentScenario;
diff --git a/web/src/components/CaseBuilder/Buses/BusesTable.test.ts b/web/src/components/CaseBuilder/BusesTable.test.ts
similarity index 95%
rename from web/src/components/CaseBuilder/Buses/BusesTable.test.ts
rename to web/src/components/CaseBuilder/BusesTable.test.ts
index dcda485..b199df8 100644
--- a/web/src/components/CaseBuilder/Buses/BusesTable.test.ts
+++ b/web/src/components/CaseBuilder/BusesTable.test.ts
@@ -6,7 +6,7 @@
 
 import assert from "node:assert";
 import { generateBusesCsv, parseBusesCsv } from "./BusesTable";
-import { BUS_TEST_DATA_1 } from "./BusOperations.test";
+import { BUS_TEST_DATA_1 } from "../../core/Operations/busOperations.test";
 
 test("generate CSV", () => {
   const actualCsv = generateBusesCsv(BUS_TEST_DATA_1);
diff --git a/web/src/components/CaseBuilder/Buses/BusesTable.tsx b/web/src/components/CaseBuilder/BusesTable.tsx
similarity index 97%
rename from web/src/components/CaseBuilder/Buses/BusesTable.tsx
rename to web/src/components/CaseBuilder/BusesTable.tsx
index e82a69f..c137dad 100644
--- a/web/src/components/CaseBuilder/Buses/BusesTable.tsx
+++ b/web/src/components/CaseBuilder/BusesTable.tsx
@@ -5,14 +5,14 @@
  */
 
 import Papa from "papaparse";
-import { Buses, UnitCommitmentScenario } from "../../../core/data";
+import { Buses, UnitCommitmentScenario } from "../../core/fixtures";
 import { useEffect, useRef } from "react";
 import {
   CellComponent,
   ColumnDefinition,
   TabulatorFull as Tabulator,
 } from "tabulator-tables";
-import { ValidationError } from "../../../core/Validation/validate";
+import { ValidationError } from "../../core/Validation/validate";
 
 const generateBusesTableData = (scenario: UnitCommitmentScenario) => {
   const tableData: { [name: string]: any }[] = [];
diff --git a/web/src/components/CaseBuilder/CaseBuilder.tsx b/web/src/components/CaseBuilder/CaseBuilder.tsx
index 4b72f48..d7a48e4 100644
--- a/web/src/components/CaseBuilder/CaseBuilder.tsx
+++ b/web/src/components/CaseBuilder/CaseBuilder.tsx
@@ -4,19 +4,19 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import Header from "./Header/Header";
-import Parameters from "./Parameters/Parameters";
-import BusesComponent from "./Buses/BusesComponent";
+import Header from "./Header";
+import Parameters from "./Parameters";
+import BusesComponent from "./BusesComponent";
 import {
   BLANK_SCENARIO,
   TEST_SCENARIO,
   UnitCommitmentScenario,
-} from "../../core/data";
+} from "../../core/fixtures";
 
 import "tabulator-tables/dist/css/tabulator.min.css";
 import "../Common/Forms/Tables.css";
 import { useState } from "react";
-import Footer from "./Footer/Footer";
+import Footer from "./Footer";
 import { validate, ValidationError } from "../../core/Validation/validate";
 import { offerDownload } from "../Common/io";
 import {
@@ -24,11 +24,11 @@ import {
   createBus,
   deleteBus,
   renameBus,
-} from "./Buses/BusOperations";
+} from "../../core/Operations/busOperations";
 import {
   changeTimeHorizon,
   changeTimeStep,
-} from "./Parameters/ParameterOperations";
+} from "../../core/Operations/parameterOperations";
 
 const CaseBuilder = () => {
   const [scenario, setScenario] = useState(TEST_SCENARIO);
diff --git a/web/src/components/CaseBuilder/Footer/Footer.module.css b/web/src/components/CaseBuilder/Footer.module.css
similarity index 100%
rename from web/src/components/CaseBuilder/Footer/Footer.module.css
rename to web/src/components/CaseBuilder/Footer.module.css
diff --git a/web/src/components/CaseBuilder/Footer/Footer.tsx b/web/src/components/CaseBuilder/Footer.tsx
similarity index 100%
rename from web/src/components/CaseBuilder/Footer/Footer.tsx
rename to web/src/components/CaseBuilder/Footer.tsx
diff --git a/web/src/components/CaseBuilder/Header/Header.module.css b/web/src/components/CaseBuilder/Header.module.css
similarity index 100%
rename from web/src/components/CaseBuilder/Header/Header.module.css
rename to web/src/components/CaseBuilder/Header.module.css
diff --git a/web/src/components/CaseBuilder/Header/Header.tsx b/web/src/components/CaseBuilder/Header.tsx
similarity index 86%
rename from web/src/components/CaseBuilder/Header/Header.tsx
rename to web/src/components/CaseBuilder/Header.tsx
index 97982b3..9f84327 100644
--- a/web/src/components/CaseBuilder/Header/Header.tsx
+++ b/web/src/components/CaseBuilder/Header.tsx
@@ -5,10 +5,10 @@
  */
 
 import styles from "./Header.module.css";
-import SiteHeaderButton from "../../Common/Buttons/SiteHeaderButton";
-import { UnitCommitmentScenario } from "../../../core/data";
+import SiteHeaderButton from "../Common/Buttons/SiteHeaderButton";
+import { UnitCommitmentScenario } from "../../core/fixtures";
 import { useRef } from "react";
-import FileUploadElement from "../../Common/Buttons/FileUploadElement";
+import FileUploadElement from "../Common/Buttons/FileUploadElement";
 
 interface HeaderProps {
   onClear: () => void;
diff --git a/web/src/components/CaseBuilder/Parameters/Parameters.tsx b/web/src/components/CaseBuilder/Parameters.tsx
similarity index 85%
rename from web/src/components/CaseBuilder/Parameters/Parameters.tsx
rename to web/src/components/CaseBuilder/Parameters.tsx
index 70c031c..11a2879 100644
--- a/web/src/components/CaseBuilder/Parameters/Parameters.tsx
+++ b/web/src/components/CaseBuilder/Parameters.tsx
@@ -4,11 +4,11 @@
  * 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/data";
-import { ValidationError } from "../../../core/Validation/validate";
+import SectionHeader from "../Common/SectionHeader/SectionHeader";
+import Form from "../Common/Forms/Form";
+import TextInputRow from "../Common/Forms/TextInputRow";
+import { UnitCommitmentScenario } from "../../core/fixtures";
+import { ValidationError } from "../../core/Validation/validate";
 
 interface ParametersProps {
   scenario: UnitCommitmentScenario;
diff --git a/web/src/components/CaseBuilder/Buses/BusOperations.test.ts b/web/src/core/Operations/busOperations.test.ts
similarity index 97%
rename from web/src/components/CaseBuilder/Buses/BusOperations.test.ts
rename to web/src/core/Operations/busOperations.test.ts
index f9c8a58..9563674 100644
--- a/web/src/components/CaseBuilder/Buses/BusOperations.test.ts
+++ b/web/src/core/Operations/busOperations.test.ts
@@ -4,13 +4,13 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import { UnitCommitmentScenario } from "../../../core/data";
+import { UnitCommitmentScenario } from "../fixtures";
 import {
   changeBusData,
   createBus,
   deleteBus,
   renameBus,
-} from "./BusOperations";
+} from "./busOperations";
 import assert from "node:assert";
 
 export const BUS_TEST_DATA_1: UnitCommitmentScenario = {
diff --git a/web/src/components/CaseBuilder/Buses/BusOperations.ts b/web/src/core/Operations/busOperations.ts
similarity index 94%
rename from web/src/components/CaseBuilder/Buses/BusOperations.ts
rename to web/src/core/Operations/busOperations.ts
index 1d55c67..ffccc0c 100644
--- a/web/src/components/CaseBuilder/Buses/BusOperations.ts
+++ b/web/src/core/Operations/busOperations.ts
@@ -4,8 +4,8 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import { Buses, UnitCommitmentScenario } from "../../../core/data";
-import { ValidationError } from "../../../core/Validation/validate";
+import { Buses, UnitCommitmentScenario } from "../fixtures";
+import { ValidationError } from "../Validation/validate";
 
 const generateUniqueBusName = (scenario: UnitCommitmentScenario) => {
   let newBusName = "b";
diff --git a/web/src/components/CaseBuilder/Parameters/ParameterOperations.test.ts b/web/src/core/Operations/parameterOperations.test.ts
similarity index 97%
rename from web/src/components/CaseBuilder/Parameters/ParameterOperations.test.ts
rename to web/src/core/Operations/parameterOperations.test.ts
index 38a4716..29f82b7 100644
--- a/web/src/components/CaseBuilder/Parameters/ParameterOperations.test.ts
+++ b/web/src/core/Operations/parameterOperations.test.ts
@@ -8,8 +8,8 @@ import {
   changeTimeHorizon,
   changeTimeStep,
   evaluatePwlFunction,
-} from "./ParameterOperations";
-import { BUS_TEST_DATA_1, BUS_TEST_DATA_2 } from "../Buses/BusOperations.test";
+} from "./parameterOperations";
+import { BUS_TEST_DATA_1, BUS_TEST_DATA_2 } from "./busOperations.test";
 import assert from "node:assert";
 
 test("changeTimeHorizon: Shrink 1", () => {
diff --git a/web/src/components/CaseBuilder/Parameters/ParameterOperations.ts b/web/src/core/Operations/parameterOperations.ts
similarity index 96%
rename from web/src/components/CaseBuilder/Parameters/ParameterOperations.ts
rename to web/src/core/Operations/parameterOperations.ts
index 1ad44e0..f502da6 100644
--- a/web/src/components/CaseBuilder/Parameters/ParameterOperations.ts
+++ b/web/src/core/Operations/parameterOperations.ts
@@ -4,8 +4,8 @@
  * Released under the modified BSD license. See COPYING.md for more details.
  */
 
-import { Buses, UnitCommitmentScenario } from "../../../core/data";
-import { ValidationError } from "../../../core/Validation/validate";
+import { Buses, UnitCommitmentScenario } from "../fixtures";
+import { ValidationError } from "../Validation/validate";
 
 export const changeTimeHorizon = (
   scenario: UnitCommitmentScenario,
diff --git a/web/src/core/data.tsx b/web/src/core/fixtures.tsx
similarity index 100%
rename from web/src/core/data.tsx
rename to web/src/core/fixtures.tsx