diff --git a/Hub/Hub.sln b/Hub/Hub.sln
index 02f35eb..315b27a 100644
--- a/Hub/Hub.sln
+++ b/Hub/Hub.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.28711.60
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Service", "Service\Service.csproj", "{11E9A9F4-9348-402E-8ADF-942F66965D32}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Models", "..\Weather\Models\Models.csproj", "{7DE44178-B63E-4CC4-88AE-B322274EDE26}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{11E9A9F4-9348-402E-8ADF-942F66965D32}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11E9A9F4-9348-402E-8ADF-942F66965D32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11E9A9F4-9348-402E-8ADF-942F66965D32}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DE44178-B63E-4CC4-88AE-B322274EDE26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DE44178-B63E-4CC4-88AE-B322274EDE26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DE44178-B63E-4CC4-88AE-B322274EDE26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DE44178-B63E-4CC4-88AE-B322274EDE26}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Hub/Service/Controllers/ValuesController.cs b/Hub/Service/Controllers/ValuesController.cs
index fe3f0e7..b324e7c 100644
--- a/Hub/Service/Controllers/ValuesController.cs
+++ b/Hub/Service/Controllers/ValuesController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 
-namespace Hub.Service.Controllers
+namespace ChrisKaczor.HomeMonitor.Hub.Service.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
diff --git a/Dockerfile-HubService b/Hub/Service/Dockerfile
similarity index 54%
rename from Dockerfile-HubService
rename to Hub/Service/Dockerfile
index 2e65d28..6d6e557 100644
--- a/Dockerfile-HubService
+++ b/Hub/Service/Dockerfile
@@ -4,14 +4,13 @@ EXPOSE 80
 
 FROM microsoft/dotnet:2.2-sdk-stretch AS build
 WORKDIR /src
-COPY ["Hub/Service/Service.csproj", "Hub/Service/"]
-COPY ["Weather/Models/Models.csproj", "Weather/Models/"]
-RUN dotnet restore "Hub/Service/Service.csproj"
+COPY ["./Service.csproj", "./"]
+RUN dotnet restore "Service.csproj"
 COPY . .
-WORKDIR "/src/Hub/Service"
+WORKDIR "/src"
 RUN dotnet publish "Service.csproj" -c Release -o /app
 
 FROM base AS final
 WORKDIR /app
 COPY --from=build /app .
-ENTRYPOINT ["dotnet", "Hub.Service.dll"]
\ No newline at end of file
+ENTRYPOINT ["dotnet", "ChrisKaczor.HomeMonitor.Hub.Service.dll"]
\ No newline at end of file
diff --git a/Hub/Service/Hubs/WeatherHub.cs b/Hub/Service/Hubs/WeatherHub.cs
index b600005..4d75d1d 100644
--- a/Hub/Service/Hubs/WeatherHub.cs
+++ b/Hub/Service/Hubs/WeatherHub.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.SignalR;
 using System;
 using System.Threading.Tasks;
 
-namespace Hub.Service.Hubs
+namespace ChrisKaczor.HomeMonitor.Hub.Service.Hubs
 {
     [UsedImplicitly]
     public class WeatherHub : Microsoft.AspNetCore.SignalR.Hub
diff --git a/Hub/Service/Program.cs b/Hub/Service/Program.cs
index 062d712..d475899 100644
--- a/Hub/Service/Program.cs
+++ b/Hub/Service/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
-namespace Hub.Service
+namespace ChrisKaczor.HomeMonitor.Hub.Service
 {
     public static class Program
     {
diff --git a/Hub/Service/Service.csproj b/Hub/Service/Service.csproj
index 07a5ce4..fb7c040 100644
--- a/Hub/Service/Service.csproj
+++ b/Hub/Service/Service.csproj
@@ -4,18 +4,15 @@
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-    <AssemblyName>Hub.Service</AssemblyName>
-    <RootNamespace>Hub.Service</RootNamespace>
+    <AssemblyName>ChrisKaczor.HomeMonitor.Hub.Service</AssemblyName>
+    <RootNamespace>ChrisKaczor.HomeMonitor.Hub.Service</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="ChrisKaczor.HomeMonitor.Weather.Models" Version="1.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\Weather\Models\Models.csproj" />
-  </ItemGroup>
-
 
 </Project>
diff --git a/Hub/Service/Startup.cs b/Hub/Service/Startup.cs
index a567048..0583264 100644
--- a/Hub/Service/Startup.cs
+++ b/Hub/Service/Startup.cs
@@ -1,10 +1,10 @@
-using Hub.Service.Hubs;
+using ChrisKaczor.HomeMonitor.Hub.Service.Hubs;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Hub.Service
+namespace ChrisKaczor.HomeMonitor.Hub.Service
 {
     public class Startup
     {