diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 02972513..817dcbcc 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -26,16 +26,16 @@ jobs:
       run: mkdir ~/nuget
 
     - name: Restore solution
-      run: dotnet restore src/Dependency.slnx
+      run: dotnet restore
 
     - name: Build solution
-      run: dotnet build src/Dependency.slnx --no-restore  -c Release
+      run: dotnet build --no-restore  -c Release
 
     - name: Test solution
-      run: dotnet test src/Dependency.slnx --no-restore  -c Release
+      run: dotnet test --no-restore  -c Release
 
     - name: Pack solution
-      run: dotnet pack src/Dependency.slnx --no-restore -o ~/nuget  -c Release
+      run: dotnet pack --no-restore -o ~/nuget  -c Release
 
     - name: Push Packages
       if: ${{ github.event_name == 'release' }}
diff --git a/Dependency.slnx b/Dependency.slnx
new file mode 100644
index 00000000..91b65021
--- /dev/null
+++ b/Dependency.slnx
@@ -0,0 +1,19 @@
+<Solution>
+  <Folder Name="/.sln/">
+    <File Path="./.github/workflows/dotnet.yml" />
+    <File Path="./LICENSE" />
+    <File Path="./.gitignore" />
+    <File Path="./README.md" />
+  </Folder>
+  <Folder Name="/dependency-core/">
+    <Project Path="src/dependency-core/Core.Tests/Dependency.Core.Tests.csproj" />
+    <Project Path="src/dependency-core/Core/Dependency.Core.csproj" />
+  </Folder>
+  <Folder Name="/dependency-service-provider-extensions/">
+    <Project Path="src/dependency-service-provider-extensions/ServiceProviderExtensions.Tests/ServiceProviderExtensions.Tests.csproj" />
+    <Project Path="src/dependency-service-provider-extensions/ServiceProviderExtensions/ServiceProviderExtensions.csproj" />
+  </Folder>
+  <Folder Name="/dependency/">
+    <Project Path="src/dependency/Dependency/Dependency.csproj" />
+  </Folder>
+</Solution>
\ No newline at end of file
diff --git a/src/Dependency.slnx b/src/Dependency.slnx
deleted file mode 100644
index e4143377..00000000
--- a/src/Dependency.slnx
+++ /dev/null
@@ -1,19 +0,0 @@
-<Solution>
-  <Folder Name="/.sln/">
-    <File Path="../.github/workflows/dotnet.yml" />
-    <File Path="../LICENSE" />
-    <File Path="../.gitignore" />
-    <File Path="../README.md" />
-  </Folder>
-  <Folder Name="/dependency-core/">
-    <Project Path="./dependency-core/Core.Tests/Dependency.Core.Tests.csproj" />
-    <Project Path="./dependency-core/Core/Dependency.Core.csproj" />
-  </Folder>
-  <Folder Name="/dependency-service-provider-extensions/">
-    <Project Path="./dependency-service-provider-extensions/ServiceProviderExtensions.Tests/ServiceProviderExtensions.Tests.csproj" />
-    <Project Path="./dependency-service-provider-extensions/ServiceProviderExtensions/ServiceProviderExtensions.csproj" />
-  </Folder>
-  <Folder Name="/dependency/">
-    <Project Path="./dependency/Dependency/Dependency.csproj" />
-  </Folder>
-</Solution>
\ No newline at end of file
diff --git a/src/dependency-core/Core.Tests/Tests.Dependency/Empty/Empty.cs b/src/dependency-core/Core.Tests/Tests.Dependency/Empty/Empty.cs
index 36bbdcd8..f2f16ff7 100644
--- a/src/dependency-core/Core.Tests/Tests.Dependency/Empty/Empty.cs
+++ b/src/dependency-core/Core.Tests/Tests.Dependency/Empty/Empty.cs
@@ -6,6 +6,7 @@ namespace PrimeFuncPack.Tests;
 partial class DependencyTest
 {
     [Fact]
+    [Obsolete("This test is obsolete and will be removed in future versions.")]
     public void Empty_ExpectResolvedValueIsUnit()
     {
         var actual = Dependency.Empty();
@@ -15,6 +16,7 @@ public void Empty_ExpectResolvedValueIsUnit()
     }
 
     [Fact]
+    [Obsolete("This test is obsolete and will be removed in future versions.")]
     public void EmptyTwoTimes_ExpectDependenciesAreNotSame()
     {
         var firstDependency = Dependency.Empty();
@@ -22,4 +24,4 @@ public void EmptyTwoTimes_ExpectDependenciesAreNotSame()
 
         Assert.NotSame(firstDependency, secondDependency);
     }
-}
\ No newline at end of file
+}
diff --git a/src/dependency-core/Core/Dependency.Core.csproj b/src/dependency-core/Core/Dependency.Core.csproj
index 543e87ac..72c3ba90 100644
--- a/src/dependency-core/Core/Dependency.Core.csproj
+++ b/src/dependency-core/Core/Dependency.Core.csproj
@@ -18,7 +18,7 @@
     <Description>PrimeFuncPack Dependency.Core is a core library for .NET providing a functional programming based technology to build consistent dependency trees validated in the compile time.</Description>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.Dependency.Core</AssemblyName>
-    <Version>2.2.0-preview.1</Version>
+    <Version>2.2.0-rc.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/dependency-core/Core/Dependency/Empty/Empty.cs b/src/dependency-core/Core/Dependency/Empty/Empty.cs
index ea01887e..268d3d47 100644
--- a/src/dependency-core/Core/Dependency/Empty/Empty.cs
+++ b/src/dependency-core/Core/Dependency/Empty/Empty.cs
@@ -4,7 +4,8 @@ namespace PrimeFuncPack;
 
 partial class Dependency
 {
+    [Obsolete("This method is obsolete. Call Pipe instead.")]
     public static Dependency<Unit> Empty()
         =>
         new(default(Unit));
-}
\ No newline at end of file
+}
diff --git a/src/dependency-core/Core/InternalPipelineExtensions/InternalPipelineExtensions.cs b/src/dependency-core/Core/InternalPipelineExtensions/InternalPipelineExtensions.cs
index 4c0c1b5c..14ff3441 100644
--- a/src/dependency-core/Core/InternalPipelineExtensions/InternalPipelineExtensions.cs
+++ b/src/dependency-core/Core/InternalPipelineExtensions/InternalPipelineExtensions.cs
@@ -1,4 +1,6 @@
-namespace System;
+using System;
+
+namespace PrimeFuncPack;
 
 internal static class InternalPipelineExtensions
 {
diff --git a/src/dependency-service-provider-extensions/ServiceProviderExtensions/ServiceProviderExtensions.csproj b/src/dependency-service-provider-extensions/ServiceProviderExtensions/ServiceProviderExtensions.csproj
index 2f6f5f9d..17f1e828 100644
--- a/src/dependency-service-provider-extensions/ServiceProviderExtensions/ServiceProviderExtensions.csproj
+++ b/src/dependency-service-provider-extensions/ServiceProviderExtensions/ServiceProviderExtensions.csproj
@@ -18,7 +18,7 @@
     <Description>PrimeFuncPack Dependency.ServiceProviderExtensions is a library for .NET providing useful extensions for the service provider.</Description>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.Dependency.ServiceProviderExtensions</AssemblyName>
-    <Version>2.1.1-preview.1</Version>
+    <Version>2.1.1-rc.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/dependency/Dependency/Dependency.csproj b/src/dependency/Dependency/Dependency.csproj
index 0c2ed7b8..370622a9 100644
--- a/src/dependency/Dependency/Dependency.csproj
+++ b/src/dependency/Dependency/Dependency.csproj
@@ -18,7 +18,7 @@
     <Description>PrimeFuncPack Dependency is a framework for .NET providing a functional programming based technology to build consistent dependency trees validated in the compile time.</Description>
     <RootNamespace>PrimeFuncPack</RootNamespace>
     <AssemblyName>PrimeFuncPack.Dependency</AssemblyName>
-    <Version>2.2.0-preview.1</Version>
+    <Version>2.2.0-rc.1</Version>
   </PropertyGroup>
 
   <ItemGroup>