Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs
===================================================================
diff -u -rf5cd3b2ee9b7436f606ee6bc027b795accf0549d -r333dbe6b030bb9e67ab5b9bde9f71e912ebfcf7f
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs	(.../ClosingStructureProperties.cs)	(revision f5cd3b2ee9b7436f606ee6bc027b795accf0549d)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs	(.../ClosingStructureProperties.cs)	(revision 333dbe6b030bb9e67ab5b9bde9f71e912ebfcf7f)
@@ -44,15 +44,15 @@
         private const int locationPropertyIndex = 3;
         private const int structureNormalOrientationPropertyIndex = 4;
         private const int inflowModelTypePropertyIndex = 5;
-        private const int widthFlowAperturesPropertyIndex = 6;
-        private const int areaFlowAperturesPropertyIndex = 7;
-        private const int identicalAperturesPropertyIndex = 8;
-        private const int flowWidthAtBottomProtectionPropertyIndex = 9;
-        private const int storageStructureAreaPropertyIndex = 10;
-        private const int allowedLevelIncreaseStoragePropertyIndex = 11;
-        private const int levelCrestStructureNotClosingPropertyIndex = 12;
-        private const int thresholdHeightOpenWeirPropertyIndex = 13;
-        private const int insideWaterLevelPropertyIndex = 14;
+        private const int insideWaterLevelPropertyIndex = 6;
+        private const int widthFlowAperturesPropertyIndex = 7;
+        private const int areaFlowAperturesPropertyIndex = 8;
+        private const int identicalAperturesPropertyIndex = 9;
+        private const int flowWidthAtBottomProtectionPropertyIndex = 10;
+        private const int storageStructureAreaPropertyIndex = 11;
+        private const int allowedLevelIncreaseStoragePropertyIndex = 12;
+        private const int levelCrestStructureNotClosingPropertyIndex = 13;
+        private const int thresholdHeightOpenWeirPropertyIndex = 14;
         private const int criticalOvertoppingDischargePropertyIndex = 15;
         private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 16;
         private const int failureProbabilityOpenStructurePropertyIndex = 17;
@@ -120,6 +120,19 @@
             }
         }
 
+        [PropertyOrder(insideWaterLevelPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
+        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))]
+        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName))]
+        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_InsideWaterLevel_Description))]
+        public NormalDistributionProperties InsideWaterLevel
+        {
+            get
+            {
+                return new NormalDistributionProperties(data.InsideWaterLevel);
+            }
+        }
+
         [PropertyOrder(widthFlowAperturesPropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))]
@@ -221,21 +234,8 @@
             {
                 return new NormalDistributionProperties(data.ThresholdHeightOpenWeir);
             }
-        }
+        }        
 
-        [PropertyOrder(insideWaterLevelPropertyIndex)]
-        [TypeConverter(typeof(ExpandableObjectConverter))]
-        [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_HydraulicData))]
-        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName))]
-        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_InsideWaterLevel_Description))]
-        public NormalDistributionProperties InsideWaterLevel
-        {
-            get
-            {
-                return new NormalDistributionProperties(data.InsideWaterLevel);
-            }
-        }
-
         [PropertyOrder(criticalOvertoppingDischargePropertyIndex)]
         [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_Schematization))]
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs
===================================================================
diff -u -r8cb53ca5d3528eb63d72dff288e162993c1adc04 -r333dbe6b030bb9e67ab5b9bde9f71e912ebfcf7f
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs	(.../ClosingStructurePropertiesTest.cs)	(revision 8cb53ca5d3528eb63d72dff288e162993c1adc04)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs	(.../ClosingStructurePropertiesTest.cs)	(revision 333dbe6b030bb9e67ab5b9bde9f71e912ebfcf7f)
@@ -39,15 +39,15 @@
         private const int locationPropertyIndex = 2;
         private const int structureNormalOrientationPropertyIndex = 3;
         private const int inflowModelTypePropertyIndex = 4;
-        private const int widthFlowAperturesPropertyIndex = 5;
-        private const int areaFlowAperturesPropertyIndex = 6;
-        private const int identicalAperturesPropertyIndex = 7;
-        private const int flowWidthAtBottomProtectionPropertyIndex = 8;
-        private const int storageStructureAreaPropertyIndex = 9;
-        private const int allowedLevelIncreaseStoragePropertyIndex = 10;
-        private const int levelCrestStructureNotClosingPropertyIndex = 11;
-        private const int thresholdHeightOpenWeirPropertyIndex = 12;
-        private const int insideWaterLevelPropertyIndex = 13;
+        private const int insideWaterLevelPropertyIndex = 5;
+        private const int widthFlowAperturesPropertyIndex = 6;
+        private const int areaFlowAperturesPropertyIndex = 7;
+        private const int identicalAperturesPropertyIndex = 8;
+        private const int flowWidthAtBottomProtectionPropertyIndex = 9;
+        private const int storageStructureAreaPropertyIndex = 10;
+        private const int allowedLevelIncreaseStoragePropertyIndex = 11;
+        private const int levelCrestStructureNotClosingPropertyIndex = 12;
+        private const int thresholdHeightOpenWeirPropertyIndex = 13;
         private const int criticalOvertoppingDischargePropertyIndex = 14;
         private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 15;
         private const int failureProbabilityOpenStructurePropertyIndex = 16;
@@ -151,7 +151,6 @@
             Assert.AreEqual(18, dynamicProperties.Count);
 
             const string schematizationCategory = "Schematisatie";
-            const string hydraulicDataCategory = "Hydraulische gegevens";
             const string generalCategory = "Algemeen";
 
             PropertyDescriptor idProperty = dynamicProperties[idPropertyIndex];
@@ -190,6 +189,14 @@
                                                                             "Instroommodel van het kunstwerk.",
                                                                             true);
 
+            PropertyDescriptor insideWaterLevelProperty = dynamicProperties[insideWaterLevelPropertyIndex];
+            Assert.IsInstanceOf<ExpandableObjectConverter>(insideWaterLevelProperty.Converter);
+            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(insideWaterLevelProperty,
+                                                                            schematizationCategory,
+                                                                            "Binnenwaterstand [m+NAP]",
+                                                                            "Binnenwaterstand.",
+                                                                            true);
+
             PropertyDescriptor widthFlowAperturesProperty = dynamicProperties[widthFlowAperturesPropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(widthFlowAperturesProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(widthFlowAperturesProperty,
@@ -253,14 +260,6 @@
                                                                             "Drempelhoogte niet gesloten kering of hoogte van de onderkant van de wand/drempel.",
                                                                             true);
 
-            PropertyDescriptor insideWaterLevelProperty = dynamicProperties[insideWaterLevelPropertyIndex];
-            Assert.IsInstanceOf<ExpandableObjectConverter>(insideWaterLevelProperty.Converter);
-            PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(insideWaterLevelProperty,
-                                                                            hydraulicDataCategory,
-                                                                            "Binnenwaterstand [m+NAP]",
-                                                                            "Binnenwaterstand.",
-                                                                            true);
-
             PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex];
             Assert.IsInstanceOf<ExpandableObjectConverter>(criticalOvertoppingDischargeProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(criticalOvertoppingDischargeProperty,