diff --git a/NvmlWrapper.cs b/services/NvmlWrapper.cs
similarity index 100%
rename from NvmlWrapper.cs
rename to services/NvmlWrapper.cs
diff --git a/Program.cs b/services/Program.cs
similarity index 100%
rename from Program.cs
rename to services/Program.cs
diff --git a/Properties/launchSettings.json b/services/Properties/launchSettings.json
similarity index 100%
rename from Properties/launchSettings.json
rename to services/Properties/launchSettings.json
diff --git a/README.md b/services/README.md
similarity index 100%
rename from README.md
rename to services/README.md
diff --git a/ResourceMonitorService.csproj b/services/ResourceMonitorService.csproj
similarity index 100%
rename from ResourceMonitorService.csproj
rename to services/ResourceMonitorService.csproj
diff --git a/ResourceMonitorService.sln b/services/ResourceMonitorService.sln
similarity index 100%
rename from ResourceMonitorService.sln
rename to services/ResourceMonitorService.sln
diff --git a/Startup .cs b/services/Startup .cs
similarity index 100%
rename from Startup .cs
rename to services/Startup .cs
diff --git a/Worker.cs b/services/Worker.cs
similarity index 100%
rename from Worker.cs
rename to services/Worker.cs
diff --git a/appsettings.Development.json b/services/appsettings.Development.json
similarity index 100%
rename from appsettings.Development.json
rename to services/appsettings.Development.json
diff --git a/appsettings.json b/services/appsettings.json
similarity index 100%
rename from appsettings.json
rename to services/appsettings.json
diff --git a/publish/configure_firewall.ps1 b/services/publish/configure_firewall.ps1
similarity index 100%
rename from publish/configure_firewall.ps1
rename to services/publish/configure_firewall.ps1
diff --git a/publish/install-service.bat b/services/publish/install-service.bat
similarity index 100%
rename from publish/install-service.bat
rename to services/publish/install-service.bat
diff --git a/publish/publish/appsettings.Development.json b/services/publish/publish/appsettings.Development.json
similarity index 100%
rename from publish/publish/appsettings.Development.json
rename to services/publish/publish/appsettings.Development.json
diff --git a/publish/publish/appsettings.json b/services/publish/publish/appsettings.json
similarity index 100%
rename from publish/publish/appsettings.json
rename to services/publish/publish/appsettings.json
diff --git a/publish/publish/publish/appsettings.Development.json b/services/publish/publish/publish/appsettings.Development.json
similarity index 100%
rename from publish/publish/publish/appsettings.Development.json
rename to services/publish/publish/publish/appsettings.Development.json
diff --git a/publish/publish/publish/appsettings.json b/services/publish/publish/publish/appsettings.json
similarity index 100%
rename from publish/publish/publish/appsettings.json
rename to services/publish/publish/publish/appsettings.json
diff --git a/publish/publish/publish/publish/appsettings.Development.json b/services/publish/publish/publish/publish/appsettings.Development.json
similarity index 100%
rename from publish/publish/publish/publish/appsettings.Development.json
rename to services/publish/publish/publish/publish/appsettings.Development.json
diff --git a/publish/publish/publish/publish/appsettings.json b/services/publish/publish/publish/publish/appsettings.json
similarity index 100%
rename from publish/publish/publish/publish/appsettings.json
rename to services/publish/publish/publish/publish/appsettings.json
diff --git a/src/components.js b/src/components.js
deleted file mode 100644
index 84f41d9..0000000
--- a/src/components.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import dynamic from 'next/dynamic';
-
-const components = {
-  // other components
-  resourceUsage: dynamic(() => import('./resourceUsage/component')),
-  yourwidget: dynamic(() => import("./yourwidget/component"))
-};
-
-export default components;
\ No newline at end of file
diff --git a/src/widgets.js b/src/widgets.js
deleted file mode 100644
index e405a6b..0000000
--- a/src/widgets.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import resourceUsage from "./resourceUsage/widget";
-import yourwidget from "./yourwidget/widget";
-const widgets = {
-    // other widgets
-    resourceUsage: resourceUsage,
-    yourwidget: yourwidget
-};
-
-export default widgets;
\ No newline at end of file
diff --git a/src/widgets/resourceUsage/component.jsx b/src/widgets/resourceUsage/component.jsx
deleted file mode 100644
index 17dcb80..0000000
--- a/src/widgets/resourceUsage/component.jsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { useTranslation } from "next-i18next";
-import Container from "components/services/widget/container";
-import Block from "components/services/widget/block";
-import useWidgetAPI from "utils/proxy/use-widget-api";
-
-export default function Component({ service }) {
-    const { t } = useTranslation();
-    const { widget } = service;
-    const { data, error } = useWidgetAPI(widget, "info");
-
-    if (error) {
-        return <Container service={service} error={error} />;
-    }
-
-    if (!data) {
-        return (
-            <Container service={service}>
-                <Block label="Loading..." />
-            </Container>
-        );
-    }
-
-    return (
-        <Container service={service}>
-            <Block label="Machine Name" value={data.ComputerInfo.MachineName} />
-            <Block label="OS Version" value={data.ComputerInfo.OSVersion} />
-            <Block label="OS Architecture" value={data.ComputerInfo.OSArchitecture} />
-            <Block label="Processor Count" value={data.ComputerInfo.ProcessorCount} />
-            <Block label="CPU Usage" value={data.CPU} />
-            <Block label="RAM Usage" value={data.RAM} />
-            <Block label="GPU Usage" value={data.GPU.Usage} />
-            <Block label="GPU Temperature" value={data.GPU.Temperature} />
-            <Block label="GPU Fan Speed" value={data.GPU.FanSpeed} />
-            <Block label="Currently Running Game" value={data.CurrentlyRunningGame} />
-        </Container>
-    );
-}
\ No newline at end of file
diff --git a/src/widgets/resourceUsage/widget.js b/src/widgets/resourceUsage/widget.js
deleted file mode 100644
index eb2e4dc..0000000
--- a/src/widgets/resourceUsage/widget.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import genericProxyHandler from "utils/proxy/handlers/generic";
-
-const widget = {
-    api: "http://192.168.50.201:5000/api/resource-usage",
-    proxyHandler: genericProxyHandler,
-    mappings: {
-        info: {
-            endpoint: ""
-        }
-    }
-};
-
-export default widget;
\ No newline at end of file
diff --git a/src/widgets/yourwidget/component.jsx b/src/widgets/yourwidget/component.jsx
deleted file mode 100644
index e496ab2..0000000
--- a/src/widgets/yourwidget/component.jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useTranslation } from "next-i18next";
-
-import Container from "components/services/widget/container";
-import Block from "components/services/widget/block";
-import useWidgetAPI from "utils/proxy/use-widget-api";
-
-export default function Component({ service }) {
-  const { t } = useTranslation();
-  const { widget } = service;
-  const { data, error } = useWidgetAPI(widget, "info");
-
-  if (error) {
-    return <Container service={service} error={error} />;
-  }
-
-  if (!data) {
-    return (
-      <Container service={service}>
-        <Block label="yourwidget.key1" />
-        <Block label="yourwidget.key2" />
-        <Block label="yourwidget.key3" />
-      </Container>
-    );
-  }
-
-  return (
-    <Container service={service}>
-      <Block label="yourwidget.key1" value={t("common.number", { value: data.key1 })} />
-      <Block label="yourwidget.key2" value={t("common.number", { value: data.key2 })} />
-      <Block label="yourwidget.key3" value={t("common.number", { value: data.key3 })} />
-    </Container>
-  );
-}
\ No newline at end of file
diff --git a/src/widgets/yourwidget/widget.js b/src/widgets/yourwidget/widget.js
deleted file mode 100644
index d30edbe..0000000
--- a/src/widgets/yourwidget/widget.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import genericProxyHandler from "utils/proxy/handlers/generic"; 
-
-const widget =  {
-  api: "{url}/{endpoint}" ,
-  proxyHandler: genericProxyHandler ,
-
-  mappings:  {
-    info:  {
-      endpoint: "v1/info" ,
-    },
-  },
-};
-
-export default widget;
\ No newline at end of file