Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,10 +22,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,10 +22,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -20,17 +20,17 @@
 // All rights reserved.
 
 using System;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentResultTypes;
-using Assembly.Kernel.Model.CategoryLimits;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.AssessmentResultTypes;
+using Assembly.Kernel.Old.Model.CategoryLimits;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.Common.Primitives;
-using IFailureMechanismSectionAssemblyCalculatorKernel = Assembly.Kernel.Interfaces.IAssessmentResultsTranslator;
+using IFailureMechanismSectionAssemblyCalculatorKernel = Assembly.Kernel.Old.Interfaces.IAssessmentResultsTranslator;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly
 {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,10 +21,10 @@
 
 using System;
 using System.Collections.Generic;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCalculatorInputCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCalculatorInputCreator.cs	(.../AssemblyCalculatorInputCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCalculatorInputCreator.cs	(.../AssemblyCalculatorInputCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,7 +21,7 @@
 
 using System;
 using System.ComponentModel;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -23,8 +23,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
 using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs	(.../AssemblyErrorMessageCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs	(.../AssemblyErrorMessageCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Exceptions;
+using Assembly.Kernel.Old.Exceptions;
 using Riskeer.AssemblyTool.KernelWrapper.Properties;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssessmentSectionAssemblyInputCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssessmentSectionAssemblyInputCreator.cs	(.../AssessmentSectionAssemblyInputCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssessmentSectionAssemblyInputCreator.cs	(.../AssessmentSectionAssemblyInputCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,9 +21,9 @@
 
 using System;
 using System.ComponentModel;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
 using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/CombinedFailureMechanismSectionAssemblyCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/CombinedFailureMechanismSectionAssemblyCreator.cs	(.../CombinedFailureMechanismSectionAssemblyCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/CombinedFailureMechanismSectionAssemblyCreator.cs	(.../CombinedFailureMechanismSectionAssemblyCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Model;
 using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs	(.../FailureMechanismAssemblyCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs	(.../FailureMechanismAssemblyCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,7 +21,7 @@
 
 using System;
 using System.ComponentModel;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Model;
 using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,11 +21,11 @@
 
 using System;
 using System.ComponentModel;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentResultTypes;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.AssessmentResultTypes;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.Common.Primitives;
 
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs	(.../FailureMechanismSectionAssemblyCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs	(.../FailureMechanismSectionAssemblyCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,7 +21,7 @@
 
 using System;
 using System.ComponentModel;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionListCreator.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionListCreator.cs	(.../FailureMechanismSectionListCreator.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionListCreator.cs	(.../FailureMechanismSectionListCreator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Model;
 using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Creators
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs	(.../AssemblyToolKernelFactory.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs	(.../AssemblyToolKernelFactory.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -19,8 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Assembly.Kernel.Implementations;
-using Assembly.Kernel.Interfaces;
+using Assembly.Kernel.Old.Implementations;
+using Assembly.Kernel.Old.Interfaces;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Kernels
 {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs	(.../IAssemblyToolKernelFactory.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs	(.../IAssemblyToolKernelFactory.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -19,7 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Assembly.Kernel.Interfaces;
+using Assembly.Kernel.Old.Interfaces;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Kernels
 {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj
===================================================================
diff -u -rf5827c262df08565136b21fe7fe4c4ba47784d03 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.csproj)	(revision f5827c262df08565136b21fe7fe4c4ba47784d03)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.csproj)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -2,7 +2,7 @@
   <Import Project="$(SolutionDir)build\Source.targets" />
   <ItemGroup>
     <Reference Include="Assembly.Kernel">
-      <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll</HintPath>
+      <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs	(.../AssessmentSectionAssemblyCalculatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs	(.../AssessmentSectionAssemblyCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,9 +22,9 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -23,9 +23,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,10 +22,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentResultTypes;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.AssessmentResultTypes;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,8 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Model.CategoryLimits;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCalculatorInputCreatorTest.cs	(.../AssemblyCalculatorInputCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCalculatorInputCreatorTest.cs	(.../AssemblyCalculatorInputCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.ComponentModel;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyCategoryCreatorTest.cs	(.../AssemblyCategoryCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -23,9 +23,9 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs
===================================================================
diff -u -r05b289d71b77a75b1a72af3ed54f169fded6bd23 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs	(.../AssemblyErrorMessageCreatorTest.cs)	(revision 05b289d71b77a75b1a72af3ed54f169fded6bd23)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs	(.../AssemblyErrorMessageCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,7 +22,7 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Exceptions;
+using Assembly.Kernel.Old.Exceptions;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyInputCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyInputCreatorTest.cs	(.../AssessmentSectionAssemblyInputCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssessmentSectionAssemblyInputCreatorTest.cs	(.../AssessmentSectionAssemblyInputCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Model;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/CombinedFailureMechanismSectionAssemblyCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/CombinedFailureMechanismSectionAssemblyCreatorTest.cs	(.../CombinedFailureMechanismSectionAssemblyCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/CombinedFailureMechanismSectionAssemblyCreatorTest.cs	(.../CombinedFailureMechanismSectionAssemblyCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,8 +21,8 @@
 
 using System;
 using System.Collections.Generic;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCreatorTest.cs	(.../FailureMechanismAssemblyCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCreatorTest.cs	(.../FailureMechanismAssemblyCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,7 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Model;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,9 +22,9 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentResultTypes;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.AssessmentResultTypes;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCreatorTest.cs	(.../FailureMechanismSectionAssemblyCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCreatorTest.cs	(.../FailureMechanismSectionAssemblyCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,7 +21,7 @@
 
 using System;
 using System.ComponentModel;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionListCreatorTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionListCreatorTest.cs	(.../FailureMechanismSectionListCreatorTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionListCreatorTest.cs	(.../FailureMechanismSectionListCreatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -23,8 +23,8 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(.../AssemblyToolKernelFactoryTest.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(.../AssemblyToolKernelFactoryTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -19,8 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Assembly.Kernel.Implementations;
-using Assembly.Kernel.Interfaces;
+using Assembly.Kernel.Old.Implementations;
+using Assembly.Kernel.Old.Interfaces;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -3,6 +3,7 @@
   <ItemGroup>
     <Reference Include="Assembly.Kernel">
       <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll</HintPath>
+      <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs	(.../AssemblyCategoryAssert.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyCategoryAssert.cs	(.../AssemblyCategoryAssert.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,9 +22,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs	(.../AssessmentGradeConversionTestHelper.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentGradeConversionTestHelper.cs	(.../AssessmentGradeConversionTestHelper.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Model;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs	(.../CategoriesListTestFactory.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs	(.../CategoriesListTestFactory.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -20,9 +20,9 @@
 // All rights reserved.
 
 using System;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionAssemblyAssert.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionAssemblyAssert.cs	(.../CombinedFailureMechanismSectionAssemblyAssert.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionAssemblyAssert.cs	(.../CombinedFailureMechanismSectionAssemblyAssert.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,7 +21,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Model;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs	(.../CombinedFailureMechanismSectionsInputAssert.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionsInputAssert.cs	(.../CombinedFailureMechanismSectionsInputAssert.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -22,8 +22,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs	(.../AssessmentSectionAssemblyKernelStub.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs	(.../AssessmentSectionAssemblyKernelStub.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,10 +21,10 @@
 
 using System;
 using System.Collections.Generic;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly
 {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs	(.../CombinedFailureMechanismSectionAssemblyKernelStub.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs	(.../CombinedFailureMechanismSectionAssemblyKernelStub.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,9 +21,9 @@
 
 using System;
 using System.Collections.Generic;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly
 {
@@ -101,8 +101,7 @@
             throw new NotImplementedException();
         }
 
-        public IEnumerable<FmSectionWithDirectCategory> DeterminCombinedResultPerCommonSectionWbi3C1(IEnumerable<FailureMechanismSectionList> failureMechanismResults,
-                                                                                                     bool partialAssembly)
+        public IEnumerable<FmSectionWithDirectCategory> DetermineCombinedResultPerCommonSectionWbi3C1(IEnumerable<FailureMechanismSectionList> failureMechanismResults, bool partialAssembly)
         {
             throw new NotImplementedException();
         }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs	(.../FailureMechanismAssemblyKernelStub.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs	(.../FailureMechanismAssemblyKernelStub.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -21,11 +21,11 @@
 
 using System;
 using System.Collections.Generic;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly
 {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -20,12 +20,12 @@
 // All rights reserved.
 
 using System;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentResultTypes;
-using Assembly.Kernel.Model.CategoryLimits;
-using Assembly.Kernel.Model.FmSectionTypes;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.AssessmentResultTypes;
+using Assembly.Kernel.Old.Model.CategoryLimits;
+using Assembly.Kernel.Old.Model.FmSectionTypes;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly
 {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -20,10 +20,10 @@
 // All rights reserved.
 
 using System;
-using Assembly.Kernel.Exceptions;
-using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Old.Exceptions;
+using Assembly.Kernel.Old.Interfaces;
+using Assembly.Kernel.Old.Model;
+using Assembly.Kernel.Old.Model.CategoryLimits;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories
 {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs	(.../TestAssemblyToolKernelFactory.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs	(.../TestAssemblyToolKernelFactory.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -19,7 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Assembly.Kernel.Interfaces;
+using Assembly.Kernel.Old.Interfaces;
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -r86db41f54622d8d64a9e70cd96ae8a4198de4703
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
@@ -3,6 +3,7 @@
   <ItemGroup>
     <Reference Include="Assembly.Kernel">
       <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll</HintPath>
+      <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />