diff --git a/.gitignore b/.gitignore
index c0c35c1..548a0b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -414,6 +414,7 @@ FodyWeavers.xsd
 
 #ignore all in root folder except the allowed values
 /*
+!nuget.config
 !.editorconfig
 !.gitignore
 !LICENSE
@@ -426,4 +427,5 @@ FodyWeavers.xsd
 !/src
 !/tests
 !/tools
+!/dependencies
 !/*.[Ss][Ll][Nn]
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..89ea642
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "dependencies/Connected"]
+	path = dependencies/Connected
+	url = https://git.tompit.com/Connected/Connected.git
+[submodule "dependencies/Connected.Framework"]
+	path = dependencies/Connected.Framework
+	url = https://git.tompit.com/Connected/Connected.Framework.git
diff --git a/Framework.ServiceModel.sln b/Framework.ServiceModel.sln
index f9048cc..5149200 100644
--- a/Framework.ServiceModel.sln
+++ b/Framework.ServiceModel.sln
@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33027.239
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{6EFC1819-8C82-49C6-B893-B84E8C218560}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{EEAAA364-FCF2-4975-8321-A475778D684C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{6F70D808-2CB4-4844-B72C-BE01E91C7861}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{921C93ED-C848-4465-AE42-CE64D266719F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "dependencies\Connected\src\Connected\Connected.csproj", "{7EA2F351-8146-4265-B5D5-E399910DDF5B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "..\connected.framework\src\Connected.Entities\Connected.Entities.csproj", "{2157CA78-5896-423A-821C-C322814FE3F8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "dependencies\Connected.Framework\src\Connected.Entities\Connected.Entities.csproj", "{D418A843-2153-45BC-9F16-2A24EAD060C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj", "{0CE8C487-CE51-40EA-9525-9673277818C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj", "{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,26 +23,26 @@ Global
 		{EEAAA364-FCF2-4975-8321-A475778D684C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F70D808-2CB4-4844-B72C-BE01E91C7861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F70D808-2CB4-4844-B72C-BE01E91C7861}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F70D808-2CB4-4844-B72C-BE01E91C7861}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F70D808-2CB4-4844-B72C-BE01E91C7861}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2157CA78-5896-423A-821C-C322814FE3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2157CA78-5896-423A-821C-C322814FE3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2157CA78-5896-423A-821C-C322814FE3F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2157CA78-5896-423A-821C-C322814FE3F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0CE8C487-CE51-40EA-9525-9673277818C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CE8C487-CE51-40EA-9525-9673277818C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CE8C487-CE51-40EA-9525-9673277818C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0CE8C487-CE51-40EA-9525-9673277818C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6F70D808-2CB4-4844-B72C-BE01E91C7861} = {6EFC1819-8C82-49C6-B893-B84E8C218560}
-		{2157CA78-5896-423A-821C-C322814FE3F8} = {6EFC1819-8C82-49C6-B893-B84E8C218560}
-		{0CE8C487-CE51-40EA-9525-9673277818C1} = {6EFC1819-8C82-49C6-B893-B84E8C218560}
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B} = {921C93ED-C848-4465-AE42-CE64D266719F}
+		{D418A843-2153-45BC-9F16-2A24EAD060C8} = {921C93ED-C848-4465-AE42-CE64D266719F}
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF} = {921C93ED-C848-4465-AE42-CE64D266719F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1EC384B4-F27F-4F71-8BDC-16F7BA8689E9}
diff --git a/build/buildProjects.bat b/build/buildProjects.bat
new file mode 100644
index 0000000..cb5f773
--- /dev/null
+++ b/build/buildProjects.bat
@@ -0,0 +1 @@
+dotnet build ../src/Connected.ServiceModel/Connected.ServiceModel.csproj
\ No newline at end of file
diff --git a/dependencies/Connected b/dependencies/Connected
new file mode 160000
index 0000000..9eb9949
--- /dev/null
+++ b/dependencies/Connected
@@ -0,0 +1 @@
+Subproject commit 9eb9949950a4b99f31e8800eb41e1b97ec00f8be
diff --git a/dependencies/Connected.Framework b/dependencies/Connected.Framework
new file mode 160000
index 0000000..79ea6dc
--- /dev/null
+++ b/dependencies/Connected.Framework
@@ -0,0 +1 @@
+Subproject commit 79ea6dc46dbacd608bbde582a0c560d2cc8e2154
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000..bc9e7c4
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <config>
+        <add key="repositoryPath" value="%PACKAGEHOME%/External" />
+    </config>
+
+    <packageRestore>
+        <add key="enabled" value="True" />
+        <add key="automatic" value="True" />
+    </packageRestore>
+    <packageSources>
+        <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
+    </packageSources>
+
+    <disabledPackageSources />
+</configuration>
\ No newline at end of file
diff --git a/src/Connected.ServiceModel/Connected.ServiceModel.csproj b/src/Connected.ServiceModel/Connected.ServiceModel.csproj
index 02f6d85..85103ae 100644
--- a/src/Connected.ServiceModel/Connected.ServiceModel.csproj
+++ b/src/Connected.ServiceModel/Connected.ServiceModel.csproj
@@ -1,19 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+		<Title>$(AssemblyName)</Title>
+		<Authors>Tom PIT</Authors>
+		<Copyright>2022 Tom PIT</Copyright>
+		<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
+		<PackageTags>connected;platform;</PackageTags>
+		<IncludeSymbols>True</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<PackageLicenseFile>LICENSE</PackageLicenseFile>
+		<PackageOutputPath>$(OutputPath)</PackageOutputPath>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-rc.2.22472.3" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*-*" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Entities\Connected.Entities.csproj" />
-    <ProjectReference Include="..\..\..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj" />
-    <ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<None Include="..\..\LICENSE">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
+		<None Include="..\..\README.md">
+			<Pack>True</Pack>
+			<PackagePath>\</PackagePath>
+		</None>
+	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Entities\Connected.Entities.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
+	</ItemGroup>
 </Project>