diff --git a/Build/python/mtm/zen/CreateRelease.py b/Build/python/mtm/zen/CreateRelease.py
index 9f023f5f7..36c8e2bdf 100644
--- a/Build/python/mtm/zen/CreateRelease.py
+++ b/Build/python/mtm/zen/CreateRelease.py
@@ -170,6 +170,10 @@ def _createCSharpPackage(self, includeSample, outputPath):
             self._sys.deleteDirectory('[ZenTempDir]/OptionalExtras/UnitTests')
             self._sys.removeFile('[ZenTempDir]/OptionalExtras/UnitTests.meta')
 
+            self._zipHelper.createZipFile('[ZenTempDir]/OptionalExtras/IntegrationTests', '[ZenTempDir]/OptionalExtras/IntegrationTests.zip')
+            self._sys.deleteDirectory('[ZenTempDir]/OptionalExtras/IntegrationTests')
+            self._sys.removeFile('[ZenTempDir]/OptionalExtras/IntegrationTests.meta')
+
             self._zipHelper.createZipFile('[ZenTempDir]/OptionalExtras/AutoMocking', '[ZenTempDir]/OptionalExtras/AutoMocking.zip')
             self._sys.deleteDirectory('[ZenTempDir]/OptionalExtras/AutoMocking')
             self._sys.removeFile('[ZenTempDir]/OptionalExtras/AutoMocking.meta')
diff --git a/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Readme.txt b/UnityProject/Assets/Zenject/OptionalExtras/IntegrationTests/Readme.txt
similarity index 100%
rename from UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Readme.txt
rename to UnityProject/Assets/Zenject/OptionalExtras/IntegrationTests/Readme.txt
diff --git a/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Readme.txt.meta b/UnityProject/Assets/Zenject/OptionalExtras/IntegrationTests/Readme.txt.meta
similarity index 100%
rename from UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Readme.txt.meta
rename to UnityProject/Assets/Zenject/OptionalExtras/IntegrationTests/Readme.txt.meta
diff --git a/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Editor/Zenject-tests.csproj b/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Editor/Zenject-tests.csproj
index e0e166ba3..cd76f1c2a 100644
--- a/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Editor/Zenject-tests.csproj
+++ b/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Editor/Zenject-tests.csproj
@@ -88,6 +88,12 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Bindings\TestMultiBind.cs" />
+    <Compile Include="Bindings\TestMultiBindAgain.cs" />
+    <Compile Include="Bindings\TestRebind.cs" />
+    <Compile Include="Bindings\TestToGetter.cs" />
+    <Compile Include="Bindings\TestToLookup.cs" />
+    <Compile Include="Bindings\TestUnbind.cs" />
     <Compile Include="CommandsAndSignals\TestCommands.cs" />
     <Compile Include="CommandsAndSignals\TestCommandsOneParam.cs" />
     <Compile Include="CommandsAndSignals\TestCommandsSixParams.cs" />
@@ -95,60 +101,62 @@
     <Compile Include="CommandsAndSignals\TestSignalsOneParam.cs" />
     <Compile Include="CommandsAndSignals\TestSignalsSixParams.cs" />
     <Compile Include="CommandsAndSignals\TestSignalsWithIdentifiers.cs" />
-    <Compile Include="TestAllInjectionTypes.cs" />
-    <Compile Include="TestBaseClassPropertyInjection.cs" />
-    <Compile Include="TestBothInterfaceAndConcreteBoundToSameSingleton.cs" />
-    <Compile Include="TestCircularDependencies.cs" />
-    <Compile Include="TestConditionsBasic.cs" />
-    <Compile Include="TestConditionsComplex.cs" />
-    <Compile Include="TestConditionsFieldName.cs" />
-    <Compile Include="TestConditionsIdentifier.cs" />
-    <Compile Include="TestConditionsParents.cs" />
-    <Compile Include="TestConditionsTarget.cs" />
-    <Compile Include="TestConditionsTargetInstance.cs" />
-    <Compile Include="TestConstructorInjection.cs" />
-    <Compile Include="TestConstructorInjectionOptional.cs" />
-    <Compile Include="TestDiContainer.cs" />
-    <Compile Include="TestDuplicateInjection.cs" />
-    <Compile Include="TestFacades.cs" />
-    <Compile Include="TestFactory.cs" />
-    <Compile Include="TestFactoryNullArgs.cs" />
-    <Compile Include="TestGenericContract.cs" />
-    <Compile Include="TestIdentifiers.cs" />
-    <Compile Include="TestIFactory.cs" />
-    <Compile Include="TestIFactoryUntyped.cs" />
-    <Compile Include="TestListComparer.cs" />
-    <Compile Include="TestListInjection.cs" />
-    <Compile Include="TestMoq.cs" />
-    <Compile Include="TestMultiBind.cs" />
-    <Compile Include="TestMultiBindAgain.cs" />
-    <Compile Include="TestMultipleInterfaceSameSingle.cs" />
-    <Compile Include="TestNestedContainer.cs" />
-    <Compile Include="TestNullableValues.cs" />
-    <Compile Include="TestParameters.cs" />
-    <Compile Include="TestPostInjectCall.cs" />
-    <Compile Include="TestPostInjectParameters.cs" />
-    <Compile Include="TestPropertyInjection.cs" />
-    <Compile Include="TestRebind.cs" />
-    <Compile Include="TestResolveMany.cs" />
-    <Compile Include="TestSameConstructorArgumentType.cs" />
-    <Compile Include="TestSingleton.cs" />
-    <Compile Include="TestSingletonIdentifiers.cs" />
-    <Compile Include="TestStructInjection.cs" />
-    <Compile Include="TestSubContainer2.cs" />
-    <Compile Include="TestSubContainers.cs" />
-    <Compile Include="TestSubContainers4.cs" />
-    <Compile Include="TestTaskUpdater.cs" />
-    <Compile Include="TestTestOptional.cs" />
-    <Compile Include="TestTestUtil.cs" />
-    <Compile Include="TestToGetter.cs" />
-    <Compile Include="TestToLookup.cs" />
-    <Compile Include="TestTransientInjection.cs" />
-    <Compile Include="TestTransientMockProvider.cs" />
-    <Compile Include="TestUnbind.cs" />
-    <Compile Include="TestValidateInstaller.cs" />
-    <Compile Include="TestWithContainer.cs" />
-    <Compile Include="ZenjectProfileTest.cs" />
+    <Compile Include="Conditions\TestConditionsBasic.cs" />
+    <Compile Include="Conditions\TestConditionsComplex.cs" />
+    <Compile Include="Conditions\TestConditionsFieldName.cs" />
+    <Compile Include="Conditions\TestConditionsIdentifier.cs" />
+    <Compile Include="Conditions\TestConditionsParents.cs" />
+    <Compile Include="Conditions\TestConditionsTarget.cs" />
+    <Compile Include="Conditions\TestConditionsTargetInstance.cs" />
+    <Compile Include="Conditions\TestIdentifiers.cs" />
+    <Compile Include="Factories\TestFactory.cs" />
+    <Compile Include="Factories\TestFactoryNullArgs.cs" />
+    <Compile Include="Factories\TestIFactory.cs" />
+    <Compile Include="Factories\TestIFactoryUntyped.cs" />
+    <Compile Include="Injection\TestAllInjectionTypes.cs" />
+    <Compile Include="Injection\TestBaseClassPropertyInjection.cs" />
+    <Compile Include="Injection\TestCircularDependencies.cs" />
+    <Compile Include="Injection\TestConstructorInjection.cs" />
+    <Compile Include="Injection\TestConstructorInjectionOptional.cs" />
+    <Compile Include="Injection\TestDuplicateInjection.cs" />
+    <Compile Include="Injection\TestInjectSources.cs" />
+    <Compile Include="Injection\TestListInjection.cs" />
+    <Compile Include="Injection\TestNullableValues.cs" />
+    <Compile Include="Injection\TestParameters.cs" />
+    <Compile Include="Injection\TestPostInjectCall.cs" />
+    <Compile Include="Injection\TestPostInjectParameters.cs" />
+    <Compile Include="Injection\TestPropertyInjection.cs" />
+    <Compile Include="Injection\TestSameConstructorArgumentType.cs" />
+    <Compile Include="Injection\TestStructInjection.cs" />
+    <Compile Include="Injection\TestTestOptional.cs" />
+    <Compile Include="Injection\TestTransientInjection.cs" />
+    <Compile Include="Other\TestDiContainer.cs" />
+    <Compile Include="Other\TestGenericContract.cs" />
+    <Compile Include="Other\TestMoq.cs" />
+    <Compile Include="Other\TestResolveMany.cs" />
+    <Compile Include="Other\TestTaskUpdater.cs" />
+    <Compile Include="Other\TestTransientMockProvider.cs" />
+    <Compile Include="Other\TestValidateInstaller.cs" />
+    <Compile Include="Other\ZenjectProfileTest.cs" />
+    <Compile Include="Singletons\TestBothInterfaceAndConcreteBoundToSameSingleton.cs" />
+    <Compile Include="Singletons\TestConflictingToSingletonUses.cs" />
+    <Compile Include="Singletons\TestMultipleInterfaceSameSingle.cs" />
+    <Compile Include="Singletons\TestSingletonIdentifiers.cs" />
+    <Compile Include="Singletons\TestToInstance.cs" />
+    <Compile Include="Singletons\TestToSingle.cs" />
+    <Compile Include="Singletons\TestToSingleFactory.cs" />
+    <Compile Include="Singletons\TestToSingleInstance.cs" />
+    <Compile Include="Singletons\TestToSingleMethod.cs" />
+    <Compile Include="Singletons\TestToSingleWrongMonoBehaviour.cs" />
+    <Compile Include="SubContainers\TestFacades.cs" />
+    <Compile Include="SubContainers\TestNestedContainer.cs" />
+    <Compile Include="SubContainers\TestSubContainer2.cs" />
+    <Compile Include="SubContainers\TestSubContainer3.cs" />
+    <Compile Include="SubContainers\TestSubContainers.cs" />
+    <Compile Include="SubContainers\TestSubContainers4.cs" />
+    <Compile Include="Util\TestListComparer.cs" />
+    <Compile Include="Util\TestTestUtil.cs" />
+    <Compile Include="Util\TestWithContainer.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -158,4 +166,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Editor/Zenject-tests.csproj.user b/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Editor/Zenject-tests.csproj.user
new file mode 100644
index 000000000..fe7dc2232
--- /dev/null
+++ b/UnityProject/Assets/Zenject/OptionalExtras/UnitTests/Editor/Zenject-tests.csproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ShowAllFiles</ProjectView>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/UnityProject/Assets/Zenject/Source/Zenject.csproj b/UnityProject/Assets/Zenject/Source/Zenject.csproj
index cd05c3789..b41009d89 100644
--- a/UnityProject/Assets/Zenject/Source/Zenject.csproj
+++ b/UnityProject/Assets/Zenject/Source/Zenject.csproj
@@ -121,6 +121,8 @@
     <Compile Include="Main\IResolver.cs" />
     <Compile Include="Main\MonoInstaller.cs" />
     <Compile Include="Main\SceneCompositionRoot.cs" />
+    <Compile Include="Main\SingletonId.cs" />
+    <Compile Include="Main\SingletonRegistry.cs" />
     <Compile Include="Main\ZenConstants.cs" />
     <Compile Include="Misc\DisposableManager.cs" />
     <Compile Include="Misc\ExecutionOrderInstaller.cs" />
@@ -130,35 +132,50 @@
     <Compile Include="Misc\ITickable.cs" />
     <Compile Include="Misc\KernelUtil.cs" />
     <Compile Include="Misc\LateTickablePrioritiesInstaller.cs" />
-    <Compile Include="Misc\SingletonInstanceHelper.cs" />
     <Compile Include="Misc\StandardInstaller.cs" />
     <Compile Include="Misc\TaskUpdater.cs" />
     <Compile Include="Misc\TickableManager.cs" />
     <Compile Include="Misc\UnityEventManager.cs" />
     <Compile Include="Misc\ZenUtil.cs" />
     <Compile Include="Providers\DiContainerProvider.cs" />
-    <Compile Include="Providers\GameObjectSingletonProvider.cs" />
     <Compile Include="Providers\GameObjectTransientProvider.cs" />
     <Compile Include="Providers\GameObjectTransientProviderFromPrefab.cs" />
     <Compile Include="Providers\GameObjectTransientProviderFromPrefabResource.cs" />
     <Compile Include="Providers\InstanceProvider.cs" />
     <Compile Include="Providers\MethodProvider.cs" />
     <Compile Include="Providers\MethodProviderUntyped.cs" />
-    <Compile Include="Providers\MonoBehaviourSingletonProvider.cs" />
-    <Compile Include="Providers\PrefabSingletonId.cs" />
-    <Compile Include="Providers\PrefabSingletonProvider.cs" />
-    <Compile Include="Providers\PrefabSingletonProviderMap.cs" />
     <Compile Include="Providers\ProviderBase.cs" />
     <Compile Include="Providers\ResourceProvider.cs" />
-    <Compile Include="Providers\SingletonCreators\PrefabSingletonLazyCreator.cs" />
-    <Compile Include="Providers\SingletonCreators\SingletonLazyCreatorBase.cs" />
-    <Compile Include="Providers\SingletonCreators\SingletonLazyCreatorByFactory.cs" />
-    <Compile Include="Providers\SingletonCreators\SingletonLazyCreatorByInstance.cs" />
-    <Compile Include="Providers\SingletonCreators\SingletonLazyCreatorByMethod.cs" />
-    <Compile Include="Providers\SingletonCreators\SingletonLazyCreatorByType.cs" />
-    <Compile Include="Providers\SingletonId.cs" />
-    <Compile Include="Providers\SingletonProvider.cs" />
-    <Compile Include="Providers\SingletonProviderMap.cs" />
+    <Compile Include="Providers\Singleton\Factory\FactorySingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\Factory\FactorySingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\Factory\FactorySingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\Factory\IFactorySingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\GameObject\GameObjectSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\GameObject\GameObjectSingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\GameObject\GameObjectSingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\Instance\InstanceSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\Instance\InstanceSingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\Instance\InstanceSingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\Method\IMethodSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\Method\MethodSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\Method\MethodSingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\Method\MethodSingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\MonoBehaviour\MonoBehaviourSingletonId.cs" />
+    <Compile Include="Providers\Singleton\MonoBehaviour\MonoBehaviourSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\MonoBehaviour\MonoBehaviourSingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\MonoBehaviour\MonoBehaviourSingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\PrefabResource\PrefabResourceSingletonId.cs" />
+    <Compile Include="Providers\Singleton\PrefabResource\PrefabResourceSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\PrefabResource\PrefabResourceSingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\PrefabResource\PrefabResourceSingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\Prefab\PrefabSingletonId.cs" />
+    <Compile Include="Providers\Singleton\Prefab\PrefabSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\Prefab\PrefabSingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\Prefab\PrefabSingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\SingletonProviderCreator.cs" />
+    <Compile Include="Providers\Singleton\Type\TypeSingletonLazyCreator.cs" />
+    <Compile Include="Providers\Singleton\Type\TypeSingletonProvider.cs" />
+    <Compile Include="Providers\Singleton\Type\TypeSingletonProviderCreator.cs" />
     <Compile Include="Providers\TransientProvider.cs" />
     <Compile Include="Usage\InjectAttributeBase.cs" />
     <Compile Include="Usage\PostInjectAttribute.cs" />
@@ -176,4 +193,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>