diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..0aed759
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,12 @@
+# directories
+**/bin/
+**/obj/
+**/out/
+
+# files
+Dockerfile*
+**/*.trx
+**/*.md
+**/*.ps1
+**/*.cmd
+**/*.sh
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..73c5516
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 28d62f1..cce2780 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -4,6 +4,15 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Docker .NET Core Attach (Preview)",
+            "type": "docker",
+            "request": "attach",
+            "platform": "netCore",
+            "sourceFileMap": {
+                "/": "${workspaceFolder}"
+            }
+        },
         {
             "name": "Sledgemapper",
             "type": "coreclr",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 1dbc8ed..3192918 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -25,7 +25,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/Sledgemapper.Api/src/Sledgemapper.Api.csproj",
+                "${workspaceFolder}/Sledgemapper.Api/Sledgemapper.Api.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f781a3b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,59 @@
+# https://hub.docker.com/_/microsoft-dotnet-core
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+WORKDIR /src
+
+# copy csproj and restore as distinct layers
+#COPY *.sln .
+# COPY SignalRChat/*.csproj ./aspnetapp/
+# WORKDIR /source/aspnetapp
+# RUN dotnet restore
+COPY Sledgemapper.Api/*.csproj ./Sledgemapper.Api/
+COPY Sledgemapper.Shared/*.csproj ./Sledgemapper.Shared/
+
+WORKDIR /src/Sledgemapper.Api
+RUN dotnet restore
+
+WORKDIR /src/Sledgemapper.Shared
+RUN dotnet restore
+
+# copy everything else and build app
+WORKDIR /src
+COPY Sledgemapper.Api/. ./Sledgemapper.Api/
+COPY Sledgemapper.Shared/. ./Sledgemapper.Shared/
+WORKDIR /src/Sledgemapper.Api
+RUN dotnet publish -c release -o /app --no-restore
+
+# final stage/image
+FROM mcr.microsoft.com/dotnet/aspnet:5.0
+WORKDIR /app
+COPY --from=build /app ./
+ENTRYPOINT ["dotnet", "SignalRChat.dll"]    
+
+
+# # https://hub.docker.com/_/microsoft-dotnet-core
+# FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+
+# # copy csproj and restore as distinct layers
+# #COPY *.sln .
+# WORKDIR /source
+# COPY Sledgemapper.Api/*.csproj ./Sledgemapper.Api/
+# WORKDIR /source/Sledgemapper.Api
+# RUN dotnet restore
+
+# WORKDIR /source
+# COPY Sledgemapper.Shared/*.csproj ./Sledgemapper.Shared/
+# WORKDIR /source/Sledgemapper.Shared
+# RUN dotnet restore
+
+# # copy everything else and build app
+# WORKDIR /source
+# COPY Sledgemapper.Api/. ./Sledgemapper.Api/
+# COPY Sledgemapper.Shared/. ./Sledgemapper.Shared/
+# WORKDIR /source/Sledgemapper.Api
+# RUN dotnet publish -c release -o /app --no-restore
+
+# # final stage/image
+# FROM mcr.microsoft.com/dotnet/aspnet:5.0
+# WORKDIR /app
+# COPY --from=build /app ./
+# ENTRYPOINT ["dotnet", "Sledgemapper.Api.dll"]    
diff --git a/Sledgemapper.Api/.vscode/launch.json b/Sledgemapper.Api/.vscode/launch.json
deleted file mode 100644
index a02ce0f..0000000
--- a/Sledgemapper.Api/.vscode/launch.json
+++ /dev/null
@@ -1,37 +0,0 @@
-
-{
-   // Use IntelliSense to find out which attributes exist for C# debugging
-   // Use hover for the description of the existing attributes
-   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-   "version": "0.2.0",
-   "configurations": [
-        {
-            "name": ".NET Core Launch (web)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/SignalRChat/bin/Debug/net5.0/SignalRChat.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "stopAtEntry": false,
-            // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            },
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceFolder}/Views"
-            }
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Sledgemapper.Api/.vscode/tasks.json b/Sledgemapper.Api/.vscode/tasks.json
deleted file mode 100644
index ac87845..0000000
--- a/Sledgemapper.Api/.vscode/tasks.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/SignalRChat/SignalRChat.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/SignalRChat/SignalRChat.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/SignalRChat/SignalRChat.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Sledgemapper.Api/Dockerfile b/Sledgemapper.Api/Dockerfile
deleted file mode 100644
index b0eeaca..0000000
--- a/Sledgemapper.Api/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-#COPY *.sln .
-COPY SignalRChat/*.csproj ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet restore
-
-# copy everything else and build app
-COPY SignalRChat/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app --no-restore
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0
-WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["dotnet", "SignalRChat.dll"]    
diff --git a/Sledgemapper.Api/Dockerfile.alpine-arm64 b/Sledgemapper.Api/Dockerfile.alpine-arm64
deleted file mode 100644
index 815f135..0000000
--- a/Sledgemapper.Api/Dockerfile.alpine-arm64
+++ /dev/null
@@ -1,27 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-musl-arm64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-musl-arm64 --self-contained false --no-restore
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine-arm64v8
-WORKDIR /app
-COPY --from=build /app ./
-
-# See: https://github.com/dotnet/announcements/issues/20
-# Uncomment to enable globalization APIs (or delete)
-#ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
-#RUN apk add --no-cache icu-libs
-#ENV LC_ALL en_US.UTF-8
-#ENV LANG en_US.UTF-8
-
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.alpine-x64 b/Sledgemapper.Api/Dockerfile.alpine-x64
deleted file mode 100644
index 42c6c00..0000000
--- a/Sledgemapper.Api/Dockerfile.alpine-x64
+++ /dev/null
@@ -1,27 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-musl-x64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-musl-x64 --self-contained false --no-restore
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine
-WORKDIR /app
-COPY --from=build /app ./
-
-# See: https://github.com/dotnet/announcements/issues/20
-# Uncomment to enable globalization APIs (or delete)
-#ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
-#RUN apk add --no-cache icu-libs
-#ENV LC_ALL en_US.UTF-8
-#ENV LANG en_US.UTF-8
-
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.alpine-x64-slim b/Sledgemapper.Api/Dockerfile.alpine-x64-slim
deleted file mode 100644
index b2e2a2a..0000000
--- a/Sledgemapper.Api/Dockerfile.alpine-x64-slim
+++ /dev/null
@@ -1,27 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-musl-x64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-musl-x64 --self-contained true --no-restore /p:PublishTrimmed=true /p:PublishReadyToRun=true
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-alpine
-WORKDIR /app
-COPY --from=build /app ./
-
-# See: https://github.com/dotnet/announcements/issues/20
-# Uncomment to enable globalization APIs (or delete)
-#ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false
-#RUN apk add --no-cache icu-libs
-#ENV LC_ALL en_US.UTF-8
-#ENV LANG en_US.UTF-8
-
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.debian-arm32 b/Sledgemapper.Api/Dockerfile.debian-arm32
deleted file mode 100644
index d3d164a..0000000
--- a/Sledgemapper.Api/Dockerfile.debian-arm32
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-arm
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-arm --self-contained false --no-restore
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm32v7
-WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.debian-arm64 b/Sledgemapper.Api/Dockerfile.debian-arm64
deleted file mode 100644
index ca428fb..0000000
--- a/Sledgemapper.Api/Dockerfile.debian-arm64
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-arm64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-arm64 --self-contained false --no-restore
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm64v8
-WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.debian-x64 b/Sledgemapper.Api/Dockerfile.debian-x64
deleted file mode 100644
index ad5e7e3..0000000
--- a/Sledgemapper.Api/Dockerfile.debian-x64
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-x64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim
-WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.debian-x64-slim b/Sledgemapper.Api/Dockerfile.debian-x64-slim
deleted file mode 100644
index 9b0acae..0000000
--- a/Sledgemapper.Api/Dockerfile.debian-x64-slim
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-x64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-x64 --self-contained true --no-restore /p:PublishTrimmed=true /p:PublishReadyToRun=true
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-buster-slim
-WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.nanoserver-x64 b/Sledgemapper.Api/Dockerfile.nanoserver-x64
deleted file mode 100644
index e8b8411..0000000
--- a/Sledgemapper.Api/Dockerfile.nanoserver-x64
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r win-x64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r win-x64 --self-contained false --no-restore
-
-# final stage/image
-# Uses the 2009 release; 2004, 1909, 1903, and 1809 are other choices
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-nanoserver-2009 AS runtime
-WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.nanoserver-x64-slim b/Sledgemapper.Api/Dockerfile.nanoserver-x64-slim
deleted file mode 100644
index eab17fb..0000000
--- a/Sledgemapper.Api/Dockerfile.nanoserver-x64-slim
+++ /dev/null
@@ -1,24 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r win-x64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r win-x64 --self-contained true --no-restore /p:PublishTrimmed=true /p:PublishReadyToRun=true
-
-# final stage/image
-# Uses the 2009 release; 2004, 1909, 1903, and 1809 are other choices
-FROM mcr.microsoft.com/windows/nanoserver:2009 AS runtime
-WORKDIR /app
-COPY --from=build /app ./
-
-# Configure web servers to bind to port 80 when present
-ENV ASPNETCORE_URLS=http://+:80
-
-ENTRYPOINT ["aspnetapp"]
diff --git a/Sledgemapper.Api/Dockerfile.ubuntu-x64 b/Sledgemapper.Api/Dockerfile.ubuntu-x64
deleted file mode 100644
index a8d472d..0000000
--- a/Sledgemapper.Api/Dockerfile.ubuntu-x64
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://hub.docker.com/_/microsoft-dotnet-core
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
-WORKDIR /source
-
-# copy csproj and restore as distinct layers
-COPY *.sln .
-COPY aspnetapp/*.csproj ./aspnetapp/
-RUN dotnet restore -r linux-x64
-
-# copy everything else and build app
-COPY aspnetapp/. ./aspnetapp/
-WORKDIR /source/aspnetapp
-RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore
-
-# final stage/image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-bionic
-WORKDIR /app
-COPY --from=build /app ./
-ENTRYPOINT ["./aspnetapp"]
diff --git a/Sledgemapper.Api/src/Hubs/SledgemapperHub.cs b/Sledgemapper.Api/Hubs/SledgemapperHub.cs
similarity index 100%
rename from Sledgemapper.Api/src/Hubs/SledgemapperHub.cs
rename to Sledgemapper.Api/Hubs/SledgemapperHub.cs
diff --git a/Sledgemapper.Api/src/Pages/Error.cshtml b/Sledgemapper.Api/Pages/Error.cshtml
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Error.cshtml
rename to Sledgemapper.Api/Pages/Error.cshtml
diff --git a/Sledgemapper.Api/src/Pages/Error.cshtml.cs b/Sledgemapper.Api/Pages/Error.cshtml.cs
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Error.cshtml.cs
rename to Sledgemapper.Api/Pages/Error.cshtml.cs
diff --git a/Sledgemapper.Api/src/Pages/Index.cshtml b/Sledgemapper.Api/Pages/Index.cshtml
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Index.cshtml
rename to Sledgemapper.Api/Pages/Index.cshtml
diff --git a/Sledgemapper.Api/src/Pages/Index.cshtml.cs b/Sledgemapper.Api/Pages/Index.cshtml.cs
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Index.cshtml.cs
rename to Sledgemapper.Api/Pages/Index.cshtml.cs
diff --git a/Sledgemapper.Api/src/Pages/Privacy.cshtml b/Sledgemapper.Api/Pages/Privacy.cshtml
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Privacy.cshtml
rename to Sledgemapper.Api/Pages/Privacy.cshtml
diff --git a/Sledgemapper.Api/src/Pages/Privacy.cshtml.cs b/Sledgemapper.Api/Pages/Privacy.cshtml.cs
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Privacy.cshtml.cs
rename to Sledgemapper.Api/Pages/Privacy.cshtml.cs
diff --git a/Sledgemapper.Api/src/Pages/Shared/_Layout.cshtml b/Sledgemapper.Api/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Shared/_Layout.cshtml
rename to Sledgemapper.Api/Pages/Shared/_Layout.cshtml
diff --git a/Sledgemapper.Api/src/Pages/Shared/_ValidationScriptsPartial.cshtml b/Sledgemapper.Api/Pages/Shared/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from Sledgemapper.Api/src/Pages/Shared/_ValidationScriptsPartial.cshtml
rename to Sledgemapper.Api/Pages/Shared/_ValidationScriptsPartial.cshtml
diff --git a/Sledgemapper.Api/src/Pages/_ViewImports.cshtml b/Sledgemapper.Api/Pages/_ViewImports.cshtml
similarity index 100%
rename from Sledgemapper.Api/src/Pages/_ViewImports.cshtml
rename to Sledgemapper.Api/Pages/_ViewImports.cshtml
diff --git a/Sledgemapper.Api/src/Pages/_ViewStart.cshtml b/Sledgemapper.Api/Pages/_ViewStart.cshtml
similarity index 100%
rename from Sledgemapper.Api/src/Pages/_ViewStart.cshtml
rename to Sledgemapper.Api/Pages/_ViewStart.cshtml
diff --git a/Sledgemapper.Api/src/Program.cs b/Sledgemapper.Api/Program.cs
similarity index 100%
rename from Sledgemapper.Api/src/Program.cs
rename to Sledgemapper.Api/Program.cs
diff --git a/Sledgemapper.Api/src/Properties/launchSettings.json b/Sledgemapper.Api/Properties/launchSettings.json
similarity index 100%
rename from Sledgemapper.Api/src/Properties/launchSettings.json
rename to Sledgemapper.Api/Properties/launchSettings.json
diff --git a/Sledgemapper.Api/src/Sledgemapper.Api.csproj b/Sledgemapper.Api/Sledgemapper.Api.csproj
similarity index 74%
rename from Sledgemapper.Api/src/Sledgemapper.Api.csproj
rename to Sledgemapper.Api/Sledgemapper.Api.csproj
index ab57702..1f3ab63 100644
--- a/Sledgemapper.Api/src/Sledgemapper.Api.csproj
+++ b/Sledgemapper.Api/Sledgemapper.Api.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Sledgemapper.Shared\Sledgemapper.Shared.csproj" />
+    <ProjectReference Include="..\Sledgemapper.Shared\Sledgemapper.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Sledgemapper.Api/src/Startup.cs b/Sledgemapper.Api/Startup.cs
similarity index 97%
rename from Sledgemapper.Api/src/Startup.cs
rename to Sledgemapper.Api/Startup.cs
index 53dcfed..278683d 100644
--- a/Sledgemapper.Api/src/Startup.cs
+++ b/Sledgemapper.Api/Startup.cs
@@ -26,7 +26,7 @@ namespace SignalRChat
         {
             services.AddRazorPages();
             services.AddSignalR();
-            services.AddMediatR(typeof(Startup));
+           // services.AddMediatR(typeof(Startup));
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/Sledgemapper.Api/src/appsettings.Development.json b/Sledgemapper.Api/appsettings.Development.json
similarity index 100%
rename from Sledgemapper.Api/src/appsettings.Development.json
rename to Sledgemapper.Api/appsettings.Development.json
diff --git a/Sledgemapper.Api/src/appsettings.json b/Sledgemapper.Api/appsettings.json
similarity index 100%
rename from Sledgemapper.Api/src/appsettings.json
rename to Sledgemapper.Api/appsettings.json
diff --git a/Sledgemapper.Api/src/libman.json b/Sledgemapper.Api/libman.json
similarity index 100%
rename from Sledgemapper.Api/src/libman.json
rename to Sledgemapper.Api/libman.json
diff --git a/Sledgemapper.Api/src/.vscode/launch.json b/Sledgemapper.Api/src/.vscode/launch.json
deleted file mode 100644
index 3e18c91..0000000
--- a/Sledgemapper.Api/src/.vscode/launch.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": ".NET Core Launch (web)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            "program": "${workspaceFolder}/bin/Debug/net5.0/SignalRChat.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}",
-            "stopAtEntry": false,
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            },
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceFolder}/Views"
-            }
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Sledgemapper.Api/src/.vscode/tasks.json b/Sledgemapper.Api/src/.vscode/tasks.json
deleted file mode 100644
index a03e43b..0000000
--- a/Sledgemapper.Api/src/.vscode/tasks.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/SignalRChat.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/SignalRChat.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/SignalRChat.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/Sledgemapper.Api/src/wwwroot/css/site.css b/Sledgemapper.Api/wwwroot/css/site.css
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/css/site.css
rename to Sledgemapper.Api/wwwroot/css/site.css
diff --git a/Sledgemapper.Api/src/wwwroot/favicon.ico b/Sledgemapper.Api/wwwroot/favicon.ico
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/favicon.ico
rename to Sledgemapper.Api/wwwroot/favicon.ico
diff --git a/Sledgemapper.Api/src/wwwroot/js/chat.js b/Sledgemapper.Api/wwwroot/js/chat.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/js/chat.js
rename to Sledgemapper.Api/wwwroot/js/chat.js
diff --git a/Sledgemapper.Api/src/wwwroot/js/signalr/dist/browser/signalr.js b/Sledgemapper.Api/wwwroot/js/signalr/dist/browser/signalr.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/js/signalr/dist/browser/signalr.js
rename to Sledgemapper.Api/wwwroot/js/signalr/dist/browser/signalr.js
diff --git a/Sledgemapper.Api/src/wwwroot/js/signalr/dist/browser/signalr.min.js b/Sledgemapper.Api/wwwroot/js/signalr/dist/browser/signalr.min.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/js/signalr/dist/browser/signalr.min.js
rename to Sledgemapper.Api/wwwroot/js/signalr/dist/browser/signalr.min.js
diff --git a/Sledgemapper.Api/src/wwwroot/js/site.js b/Sledgemapper.Api/wwwroot/js/site.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/js/site.js
rename to Sledgemapper.Api/wwwroot/js/site.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/LICENSE b/Sledgemapper.Api/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/LICENSE
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/LICENSE
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to Sledgemapper.Api/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/Sledgemapper.Api/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/Sledgemapper.Api/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/Sledgemapper.Api/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation/LICENSE.md b/Sledgemapper.Api/wwwroot/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation/LICENSE.md
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/additional-methods.js b/Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/additional-methods.js
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/jquery.validate.js
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
rename to Sledgemapper.Api/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery/LICENSE.txt b/Sledgemapper.Api/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery/LICENSE.txt
rename to Sledgemapper.Api/wwwroot/lib/jquery/LICENSE.txt
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery/dist/jquery.js b/Sledgemapper.Api/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery/dist/jquery.js
rename to Sledgemapper.Api/wwwroot/lib/jquery/dist/jquery.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery/dist/jquery.min.js b/Sledgemapper.Api/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery/dist/jquery.min.js
rename to Sledgemapper.Api/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/Sledgemapper.Api/src/wwwroot/lib/jquery/dist/jquery.min.map b/Sledgemapper.Api/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from Sledgemapper.Api/src/wwwroot/lib/jquery/dist/jquery.min.map
rename to Sledgemapper.Api/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..3c9e420
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,29 @@
+# docker-compose.yml
+version: '3'
+
+services:
+  web:
+    build: 
+    # build from Dockerfile
+      context: .
+      dockerfile: Dockerfile
+    ports:
+     - "5000:80"
+    # volumes:
+    #  - .:.
+
+  redis:
+    image: redis
+
+  rabbitmq:
+    image: 'docker.io/bitnami/rabbitmq:3.8-debian-10'
+    ports:
+      - '4369:4369'
+      - '5672:5672'
+      - '25672:25672'
+      - '15672:15672'
+    volumes:
+      - 'rabbitmq_data:/bitnami'
+volumes:
+  rabbitmq_data:
+    driver: local
\ No newline at end of file