diff --git a/MatLidStore.slnLaunch b/MatLidStore.slnLaunch
new file mode 100644
index 0000000..8749d0a
--- /dev/null
+++ b/MatLidStore.slnLaunch
@@ -0,0 +1,17 @@
+[
+  {
+    "Name": "Full Debug",
+    "Projects": [
+      {
+        "Path": "src\\MLS.Api\\MLS.Api.csproj",
+        "Action": "Start",
+        "DebugTarget": "MLS.Api"
+      },
+      {
+        "Path": "src\\MLS.MatLidStoreUI\\MLS.MatLidStoreUI.esproj",
+        "Action": "Start",
+        "DebugTarget": "ng serve"
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/src/MLS.MatLidStoreUI/.vscode/tasks.json b/src/MLS.MatLidStoreUI/.vscode/tasks.json
index a298b5b..83e60c8 100644
--- a/src/MLS.MatLidStoreUI/.vscode/tasks.json
+++ b/src/MLS.MatLidStoreUI/.vscode/tasks.json
@@ -1,42 +1,39 @@
 {
-  // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
   "version": "2.0.0",
   "tasks": [
     {
+      "label": "npm: start",
       "type": "npm",
       "script": "start",
       "isBackground": true,
-      "problemMatcher": {
-        "owner": "typescript",
-        "pattern": "$tsc",
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": {
-            "regexp": "(.*?)"
-          },
-          "endsPattern": {
-            "regexp": "bundle generation complete"
+      "problemMatcher": [
+        {
+          "owner": "typescript",
+          "pattern": "$tsc",
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "Compiling",
+            "endsPattern": "Angular Live Development Server is listening on"
           }
         }
-      }
+      ]
     },
     {
+      "label": "npm: test",
       "type": "npm",
       "script": "test",
       "isBackground": true,
-      "problemMatcher": {
-        "owner": "typescript",
-        "pattern": "$tsc",
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": {
-            "regexp": "(.*?)"
-          },
-          "endsPattern": {
-            "regexp": "bundle generation complete"
+      "problemMatcher": [
+        {
+          "owner": "typescript",
+          "pattern": "$tsc",
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": "Compiling",
+            "endsPattern": "Executed .* specs"
           }
         }
-      }
+      ]
     }
   ]
 }
diff --git a/src/MLS.MatLidStoreUI/MLS.MatLidStoreUI.esproj b/src/MLS.MatLidStoreUI/MLS.MatLidStoreUI.esproj
index 2eeea1e..387102e 100644
--- a/src/MLS.MatLidStoreUI/MLS.MatLidStoreUI.esproj
+++ b/src/MLS.MatLidStoreUI/MLS.MatLidStoreUI.esproj
@@ -5,11 +5,6 @@
     <!-- Allows the build (or compile) script located on package.json to run on Build -->
     <ShouldRunBuildScript>false</ShouldRunBuildScript>
     <!-- Folder where production build objects will be placed -->
-    <BuildOutputFolder>$(MSBuildProjectDirectory)\dist\MLS.MatLidStoreUI\</BuildOutputFolder>
+    <BuildOutputFolder>$(MSBuildProjectDirectory)\dist\matlidstore-ui\</BuildOutputFolder>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="src\app\core\" />
-    <Folder Include="src\app\modules\" />
-    <Folder Include="src\app\theme\" />
-  </ItemGroup>
 </Project>