Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs
===================================================================
diff -u -rb29487c198d87b176783f2396c2b59cd76b9f246 -r57d4a6182dee3399b6f145ef84ceb75e8ac21fc5
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision b29487c198d87b176783f2396c2b59cd76b9f246)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision 57d4a6182dee3399b6f145ef84ceb75e8ac21fc5)
@@ -21,11 +21,9 @@
 
 using System;
 using System.Collections.Generic;
-using AssemblyTool.Kernel;
-using AssemblyTool.Kernel.Categories;
-using AssemblyTool.Kernel.Categories.CalculatorInput;
-using AssemblyTool.Kernel.Data;
-using AssemblyTool.Kernel.Data.AssemblyCategories;
+using Assembly.Kernel.Interfaces;
+using Assembly.Kernel.Model;
+using Assembly.Kernel.Model.CategoryLimits;
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.AssemblyTool.KernelWrapper.Creators;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
@@ -58,9 +56,8 @@
         {
             try
             {
-                var input = new CalculateAssessmentSectionCategoriesInput(new Probability(signalingNorm), new Probability(lowerLimitNorm));
-                ICategoriesCalculator kernel = factory.CreateAssemblyCategoriesKernel();
-                CalculationOutput<AssessmentSectionCategory[]> output = kernel.CalculateAssessmentSectionCategories(input);
+                ICategoryLimitsCalculator kernel = factory.CreateAssemblyCategoriesKernel();
+                IEnumerable<AssessmentSectionCategoryLimits> output = kernel.CalculateAssessmentSectionCategoryLimitsWbi21(new AssessmentSection(0.0, signalingNorm, lowerLimitNorm));
 
                 return AssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
             }
@@ -77,10 +74,10 @@
         {
             try
             {
-                var input = new CalculateFailureMechanismSectionCategoriesInput(new Probability(signalingNorm), new Probability(lowerLimitNorm),
-                                                                                failureMechanismContribution, n);
-                ICategoriesCalculator kernel = factory.CreateAssemblyCategoriesKernel();
-                CalculationOutput<FailureMechanismSectionCategory[]> output = kernel.CalculateFailureMechanismSectionCategories(input);
+                ICategoryLimitsCalculator kernel = factory.CreateAssemblyCategoriesKernel();
+                IEnumerable<FmSectionCategoryLimits> output = kernel.CalculateFmSectionCategoryLimitsWbi01(
+                    new AssessmentSection(0.0, signalingNorm, lowerLimitNorm),
+                    new FailureMechanism(n, failureMechanismContribution));
 
                 return AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(output);
             }
@@ -97,10 +94,10 @@
         {
             try
             {
-                var input = new CalculateFailureMechanismSectionCategoriesInput(new Probability(signalingNorm), new Probability(lowerLimitNorm),
-                                                                                failureMechanismContribution, n);
-                ICategoriesCalculator kernel = factory.CreateAssemblyCategoriesKernel();
-                CalculationOutput<FailureMechanismSectionCategory[]> output = kernel.CalculateGeotechnicFailureMechanismSectionCategories(input);
+                ICategoryLimitsCalculator kernel = factory.CreateAssemblyCategoriesKernel();
+                IEnumerable<FmSectionCategoryLimits> output = kernel.CalculateFmSectionCategoryLimitsWbi02(
+                    new AssessmentSection(0.0, signalingNorm, lowerLimitNorm),
+                    new FailureMechanism(n, failureMechanismContribution));
 
                 return AssemblyCategoryCreator.CreateFailureMechanismSectionAssemblyCategories(output);
             }
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs
===================================================================
diff -u -rb29487c198d87b176783f2396c2b59cd76b9f246 -r57d4a6182dee3399b6f145ef84ceb75e8ac21fc5
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision b29487c198d87b176783f2396c2b59cd76b9f246)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision 57d4a6182dee3399b6f145ef84ceb75e8ac21fc5)
@@ -21,9 +21,9 @@
 
 using System;
 using System.Collections.Generic;
-using AssemblyTool.Kernel;
-using AssemblyTool.Kernel.Data;
-using AssemblyTool.Kernel.Data.AssemblyCategories;
+using Assembly.Kernel.Model;
+using Assembly.Kernel.Model.CategoryLimits;
+using Assembly.Kernel.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -98,7 +98,7 @@
             var random = new Random(11);
             double lowerLimitNorm = random.NextDouble();
             double signalingNorm = random.NextDouble();
-            CalculationOutput<AssessmentSectionCategory[]> output = CreateAssessmentSectionCategoryKernelOutput();
+            IEnumerable<AssessmentSectionCategoryLimits> output = CreateAssessmentSectionCategoryKernelOutput();
 
             using (new AssemblyToolKernelFactoryConfig())
             {
@@ -180,7 +180,7 @@
             double signalingNorm = random.NextDouble();
             double failureMechanismContribution = random.NextDouble();
             double n = random.NextDouble(1, 5);
-            CalculationOutput<FailureMechanismSectionCategory[]> output = CreateFailureMechanismSectionCategoryKernelOutput();
+            IEnumerable<FmSectionCategoryLimits> output = CreateFailureMechanismSectionCategoryKernelOutput();
 
             using (new AssemblyToolKernelFactoryConfig())
             {
@@ -266,7 +266,7 @@
             double signalingNorm = random.NextDouble();
             double failureMechanismContribution = random.NextDouble();
             double n = random.NextDouble(1, 5);
-            CalculationOutput<FailureMechanismSectionCategory[]> output = CreateFailureMechanismSectionCategoryKernelOutput();
+            IEnumerable<FmSectionCategoryLimits> output = CreateFailureMechanismSectionCategoryKernelOutput();
 
             using (new AssemblyToolKernelFactoryConfig())
             {
@@ -314,30 +314,24 @@
             }
         }
 
-        private static CalculationOutput<AssessmentSectionCategory[]> CreateAssessmentSectionCategoryKernelOutput()
+        private static IEnumerable<AssessmentSectionCategoryLimits> CreateAssessmentSectionCategoryKernelOutput()
         {
             var random = new Random(11);
 
-            return new CalculationOutput<AssessmentSectionCategory[]>(new[]
-            {
-                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1))),
-                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1))),
-                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1))),
-                new AssessmentSectionCategory(random.NextEnumValue<AssessmentSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1)))
-            });
+            yield return new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
+            yield return new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
+            yield return new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
+            yield return new AssessmentSectionCategoryLimits(random.NextEnumValue<EAssessmentGrade>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
         }
 
-        private static CalculationOutput<FailureMechanismSectionCategory[]> CreateFailureMechanismSectionCategoryKernelOutput()
+        private static IEnumerable<FmSectionCategoryLimits> CreateFailureMechanismSectionCategoryKernelOutput()
         {
             var random = new Random(11);
 
-            return new CalculationOutput<FailureMechanismSectionCategory[]>(new[]
-            {
-                new FailureMechanismSectionCategory(random.NextEnumValue<FailureMechanismSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1))),
-                new FailureMechanismSectionCategory(random.NextEnumValue<FailureMechanismSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1))),
-                new FailureMechanismSectionCategory(random.NextEnumValue<FailureMechanismSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1))),
-                new FailureMechanismSectionCategory(random.NextEnumValue<FailureMechanismSectionCategoryGroup>(), new Probability(random.NextDouble(0, 0.5)), new Probability(random.NextDouble(0.5, 1)))
-            });
+            yield return new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
+            yield return new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
+            yield return new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
+            yield return new FmSectionCategoryLimits(random.NextEnumValue<EFmSectionCategory>(), random.NextDouble(0, 0.5), random.NextDouble(0.5, 1));
         }
     }
 }
\ No newline at end of file