diff --git a/Makefile b/Makefile
index 5106503..5c26a72 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,6 @@ run:
 
 .PHONY:build
 build:
+	- @rm -rf build
 	@npm run build
+	@rm build/static/js/*.map
diff --git a/src/components/AppHeader.tsx b/src/components/AppHeader.tsx
index 6baad48..5afccc6 100644
--- a/src/components/AppHeader.tsx
+++ b/src/components/AppHeader.tsx
@@ -7,7 +7,7 @@ import TextField from "@mui/material/TextField";
 import InputAdornment from "@mui/material/InputAdornment";
 import IconButton from "@mui/material/IconButton";
 import CancelIcon from "@mui/icons-material/Cancel";
-import { useGlobalState } from "../GlobalStateProvider";
+import { useGlobalState } from "GlobalStateProvider";
 
 export default function AppHeader() {
     const [searchValue, setSearchValue] = React.useState("");
diff --git a/src/components/Dashboard.tsx b/src/components/Dashboard.tsx
index 22ccea8..0f94b1f 100644
--- a/src/components/Dashboard.tsx
+++ b/src/components/Dashboard.tsx
@@ -1,12 +1,12 @@
 import React from "react";
 import EnvTabsSwitcher from "./EnvTabsSwitcher";
 import LoadingIndicator from "./LoadingIndicator";
-import { DashboardLoadError, DashboardResponseContent, EnvTab, Environment } from "../types";
-import { ENVIRONMENT_TABS } from "../const";
-import { dashboardApi } from "../api";
+import { DashboardLoadError, DashboardResponseContent, EnvTab, Environment } from "types";
+import { ENVIRONMENT_TABS } from "const";
+import { dashboardApi } from "api";
 import { AxiosError } from "axios";
-import LoadingError from "./LoadingError";
-import EnvironmentList from "./dashboard/EnvironmentList";
+import LoadingError from "components/LoadingError";
+import EnvironmentList from "components/dashboard/EnvironmentList";
 
 export default function Dashboard() {
     const defaultEnv = ENVIRONMENT_TABS[0];
@@ -30,7 +30,7 @@ export default function Dashboard() {
         setLoadingEnv(true);
 
         dashboardApi
-            .get(envTab.dashboardEndpoint)
+            .getFake(envTab.dashboardEndpoint)
             .then((response) => {
                 return response.data.content;
             })
diff --git a/src/components/EnvTabsSwitcher.tsx b/src/components/EnvTabsSwitcher.tsx
index c1a292e..7107943 100644
--- a/src/components/EnvTabsSwitcher.tsx
+++ b/src/components/EnvTabsSwitcher.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import Tabs from "@mui/material/Tabs";
 import Tab from "@mui/material/Tab";
 import Box from "@mui/material/Box";
-import { ENVIRONMENT_TABS } from "../const";
-import { EnvTab } from "../types";
+import { ENVIRONMENT_TABS } from "const";
+import { EnvTab } from "types";
 
 interface OnSelectTab {
     (tab: EnvTab): void;
diff --git a/src/components/LoadingError.tsx b/src/components/LoadingError.tsx
index 6f3b669..40a5f70 100644
--- a/src/components/LoadingError.tsx
+++ b/src/components/LoadingError.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { DashboardLoadError } from "../types";
+import { DashboardLoadError } from "types";
 import Alert from "@mui/material/Alert";
 import AlertTitle from "@mui/material/AlertTitle";
 import Paper from "@mui/material/Paper";
diff --git a/src/components/dashboard/EnvironmentList.tsx b/src/components/dashboard/EnvironmentList.tsx
index 0a82865..f909140 100644
--- a/src/components/dashboard/EnvironmentList.tsx
+++ b/src/components/dashboard/EnvironmentList.tsx
@@ -1,9 +1,10 @@
 import React from "react";
-import { Environment } from "../../types";
-import TenantList from "./TenantList";
+import { Environment } from "types";
+import TenantList from "components/dashboard/TenantList";
 import Typography from "@mui/material/Typography";
 import Box from "@mui/material/Box";
 import Container from "@mui/material/Container";
+import { useGlobalState } from "GlobalStateProvider";
 
 interface EnvironmentListProps {
     environments: Environment[];
@@ -15,9 +16,6 @@ export default function EnvironmentList({ environments }: EnvironmentListProps)
             <Box className="environment" key={env.name} sx={{ marginBottom: "2rem" }}>
                 <Container maxWidth={false} className="main-container">
                     <Typography variant={"h2"} key={env.name} className="environment-name">
-                        {/* <Typography component="span" variant={"h5"} key={env.name} sx={{ marginRight: "1rem" }}>
-                            environment:
-                        </Typography> */}
                         {env.name}
                     </Typography>
                     <TenantList tenants={env.tenants} />
diff --git a/src/components/dashboard/ServiceCard.tsx b/src/components/dashboard/ServiceCard.tsx
index 387f8af..524d3c1 100644
--- a/src/components/dashboard/ServiceCard.tsx
+++ b/src/components/dashboard/ServiceCard.tsx
@@ -1,5 +1,5 @@
 import React, { ReactElement } from "react";
-import { Service, Node, StatusPerTenant } from "../../types";
+import { Service, Node, StatusPerTenant } from "types";
 import Typography from "@mui/material/Typography";
 import Card from "@mui/material/Card";
 import CardContent from "@mui/material/CardContent";
diff --git a/src/components/dashboard/ServiceList.tsx b/src/components/dashboard/ServiceList.tsx
index b46e268..974504b 100644
--- a/src/components/dashboard/ServiceList.tsx
+++ b/src/components/dashboard/ServiceList.tsx
@@ -1,8 +1,8 @@
 import React from "react";
-import { Service } from "../../types";
+import { Service } from "types";
 import Grid from "@mui/material/Unstable_Grid2";
 import ServiceCard from "./ServiceCard";
-import { useGlobalState } from "../../GlobalStateProvider";
+import { useGlobalState } from "GlobalStateProvider";
 
 interface ServiceListProps {
     services: Service[];
diff --git a/src/components/dashboard/TenantList.tsx b/src/components/dashboard/TenantList.tsx
index 9a220f7..a6e3baf 100644
--- a/src/components/dashboard/TenantList.tsx
+++ b/src/components/dashboard/TenantList.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { Tenant } from "../../types";
+import { Tenant } from "types";
 import Box from "@mui/material/Box";
 import Typography from "@mui/material/Typography";
 import ServiceList from "./ServiceList";
diff --git a/src/routes/Home.tsx b/src/routes/Home.tsx
index dd02c8e..b574478 100644
--- a/src/routes/Home.tsx
+++ b/src/routes/Home.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Dashboard from "../components/Dashboard";
+import Dashboard from "components/Dashboard";
 
 export default function Home() {
     return <Dashboard />;
diff --git a/tsconfig.json b/tsconfig.json
index a273b0c..9c7d4a8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "baseUrl": "src",
     "target": "es5",
     "lib": [
       "dom",