--- a/artifacts/doc/conf/artifacts/uinfo.xml	Wed Aug 08 15:49:36 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml	Thu Aug 09 09:52:04 2018 +0200
@@ -15,7 +15,7 @@
       <data name="calculation_mode" type="String" />
     </state>
 
-    <state id="state.uinfo.distance_only" description="state.uinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.distance_only">
+    <state id="state.uinfo.distance_only" description="state.uinfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.vegetationzone.distance_only">
       <data name="ld_from" type="Double" />
       <data name="ld_to" type="Double" />
     </state>
@@ -43,39 +43,39 @@
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.uinfo.salix.distance_only" />
-      <to state="state.uinfo.use_scenario" />
+      <to state="state.uinfo.salix.use_scenario" />
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
 
-    <state id="state.uinfo.use_scenario" description="state.uinfo.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.salix.use_scenario" description="state.uinfo.salix.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.salix.use_scenario">
       <data name="use_scenario" type="Boolean" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.use_scenario" />
-      <to state="state.uinfo.scenario_type" />
+      <from state="state.uinfo.salix.use_scenario" />
+      <to state="state.uinfo.salix.scenario_type" />
       <condition data="use_scenario" value="true" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.use_scenario" />
+      <from state="state.uinfo.salix.use_scenario" />
       <to state="state.uinfo.salix_line" />
       <condition data="use_scenario" value="false" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.scenario_type" description="state.uinfo.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.salix.scenario_type">
+    <state id="state.uinfo.salix.scenario_type" description="state.uinfo.salix.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.salix.scenario_type">
       <data name="scenario_selection" type="String" />
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.scenario_type" />
+      <from state="state.uinfo.salix.scenario_type" />
       <to state="state.uinfo.distance_only_part.from_regional" />
       <condition data="scenario_selection" value="scenarioType.option1" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.scenario_type" />
+      <from state="state.uinfo.salix.scenario_type" />
       <to state="state.uinfo.salix.supraregional" />
       <condition data="scenario_selection" value="scenarioType.option2" operator="equal" />
     </transition>
@@ -87,12 +87,12 @@
     </transition>
     
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.scenario_type" />
-      <to state="state.uinfo.year_epoch" />
+      <from state="state.uinfo.salix.scenario_type" />
+      <to state="state.uinfo.salix.year_epoch" />
       <condition data="scenario_selection" value="scenarioType.option3" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.year_epoch" description="state.uinfo.year_epoch" state="org.dive4elements.river.artifacts.uinfo.salix.YearChoice" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.salix.year_epoch" description="state.uinfo.salix.year_epoch" state="org.dive4elements.river.artifacts.uinfo.salix.YearChoice" helpText="help.state.uinfo.salix.historical.year_choice">
       <data name="ye_select" type="String" />
     </state>
     <state id="state.uinfo.salix.supraregional" description="state.uinfo.salix.supraregional" state="org.dive4elements.river.artifacts.uinfo.salix.SupraRegionalTableState" helpText="help.state.uinfo.salix.supraregional">
@@ -100,22 +100,22 @@
     </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_epoch" />
+      <from state="state.uinfo.salix.year_epoch" />
       <to state="state.uinfo.load.year_with_soundings" />
       <condition data="ye_select" value="state.uinfo.year" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_epoch" />
+      <from state="state.uinfo.salix.year_epoch" />
       <to state="state.uinfo.load.epoch" />
       <condition data="ye_select" value="state.uinfo.epoch" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.load.year_with_soundings" description="state.uinfo.load.year_with_soundings" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.load.year_with_soundings" description="state.uinfo.load.year_with_soundings" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical.year">
       <data name="singleyear" type="String" />
     </state>
 
-    <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleEpochSelectState" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleEpochSelectState" helpText="help.state.uinfo.salix.historical.epoch">
       <data name="singleepoch" type="Integer" />
     </state>
 
@@ -130,7 +130,7 @@
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.salix.historical.distance_only_part">
       <data name="ld_from_part" type="Double" />
       <data name="ld_to_part" type="Double" />
        <data name="bedheights_for_part" type="Double" />
@@ -210,42 +210,42 @@
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.uinfo.inundationduration.distance_only" />
-      <to state="state.uinfo.year_totalepoch" />
+      <to state="state.uinfo.inundation.year_totalepoch" />
       <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_totalepoch" />
-      <to state="state.uinfo.load.year" />
+      <from state="state.uinfo.inundation.year_totalepoch" />
+      <to state="state.uinfo.inundation.load.year" />
       <condition data="ye_select" value="state.uinfo.year" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.year_totalepoch" />
+      <from state="state.uinfo.inundation.year_totalepoch" />
       <to state="state.uinfo.inundation.use_scenario" />
       <condition data="ye_select" value="state.uinfo.totalepoch" operator="equal" />
     </transition>
 
 
-    <state id="state.uinfo.year_totalepoch" description="state.uinfo.year_totalepoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.inundation.year_totalepoch" description="state.uinfo.inundation.year_totalepoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.inundation.year_totalepoch">
       <data name="ye_select" type="String" />
     </state>
 
 
-    <state id="state.uinfo.load.year" description="state.uinfo.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical">
+    <state id="state.uinfo.inundation.load.year" description="state.uinfo.inundation.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadSingleYearSelectState" helpText="help.state.uinfo.inundation.load.year">
       <data name="singleyear" type="String" />
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.load.year" />
+      <from state="state.uinfo.inundation.load.year" />
       <to state="state.uinfo.inundation.use_scenario" />
       <condition data="calculation_mode" value="uinfo_inundation_duration" operator="equal" />
     </transition>
 
     <!-- Doppelter State, andere ID, damit keine Mehrfach-Condition benötigt wird -->
-    <state id="state.uinfo.inundation.use_scenario" description="state.uinfo.inundation.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.inundation.use_scenario" description="state.uinfo.inundation.use_scenario" state="org.dive4elements.river.artifacts.uinfo.salix.UseScenarioChoice" helpText="help.state.uinfo.inundation.use_scenario">
       <data name="use_scenario" type="Boolean" />
     </state>
 
@@ -263,11 +263,11 @@
     </transition>
 
 
-    <state id="state.uinfo.inundation.scenario" description="state.uinfo.inundation.scenario" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadScenarioSelect" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.inundation.scenario" description="state.uinfo.inundation.scenario" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadScenarioSelect" helpText="help.state.uinfo.inundation.scenario">
       <data name="sedimentheight" type="String" /> <!-- mittelwasserlage in cm! -->
     </state>
 
-    <state id="state.uinfo.inundation.vegetation" description="state.uinfo.inundation.vegetation" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesTableState" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.inundation.vegetation" description="state.uinfo.inundation.vegetation" state="org.dive4elements.river.artifacts.uinfo.vegetationzones.VegetationZonesTableState" helpText="help.state.uinfo.vegetation">
       <data name="vegzones" type="String" />
     </state>