--- a/flys-artifacts/doc/conf/artifacts/annotation.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/annotation.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
   <states>
     <state id="state.annotation.river"
                description="state.annotation.river"
-               state="de.intevation.flys.artifacts.states.AnnotationRiverState">
+               state="org.dive4elements.river.artifacts.states.AnnotationRiverState">
       <outputmodes>
         <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
           <facets>

--- a/flys-artifacts/doc/conf/artifacts/chart.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/chart.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="new_chart">
     <states>
-         <state id="state.chart.river" description="state.winfo.river" state="de.intevation.flys.artifacts.states.RiverSelect">
+         <state id="state.chart.river" description="state.winfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect">
             <data name="river" type="String" />
          </state>
 
-         <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+         <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
              <from state="state.chart.river"/>
              <to state="state.chart.type"/>
          </transition>
 
-         <state id="state.chart.type" description="state.chart.type" state="de.intevation.flys.artifacts.ChartArtifact$ChartState">
+         <state id="state.chart.type" description="state.chart.type" state="org.dive4elements.river.artifacts.ChartArtifact$ChartState">
             <data name="chart_type" type="String" />
          </state>
 
-         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+         <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
              <from state="state.chart.type"/>
              <to state="state.chart.w_differences"/>
              <condition data="chart_type" value="chart.new.w_differences" operator="equal"/>
          </transition>
 
-         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+         <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
              <from state="state.chart.type"/>
              <to state="state.chart.km"/>
              <condition data="chart_type" value="chart.new.durationcurve" operator="equal"/>
          </transition>
 
-         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+         <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
              <from state="state.chart.type"/>
              <to state="state.chart.km"/>
              <condition data="chart_type" value="chart.new.computeddischargecurve" operator="equal"/>
          </transition>
 
-         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+         <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
              <from state="state.chart.type"/>
              <to state="state.chart.crosssection"/>
              <condition data="chart_type" value="chart.new.crosssection" operator="equal"/>
          </transition>
 
-         <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+         <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
              <from state="state.chart.type"/>
              <to state="state.chart.longitudinal_section"/>
              <condition data="chart_type" value="chart.new.longitudinal_section" operator="equal"/>
          </transition>
 
-         <state id="state.chart.km" description="state.chart.km" state="de.intevation.flys.artifacts.states.LocationSelect">
+         <state id="state.chart.km" description="state.chart.km" state="org.dive4elements.river.artifacts.states.LocationSelect">
              <data name="ld_locations" type="Double[]"/>
          </state>
 
-         <state id="state.chart.w_differences" description="state.chart.w_differences" state="de.intevation.flys.artifacts.states.WDifferencesState">
+         <state id="state.chart.w_differences" description="state.chart.w_differences" state="org.dive4elements.river.artifacts.states.WDifferencesState">
             <outputmodes>
                 <outputmode name="w_differences" description="output.w_differences" mime-type="image/png" type="chart">
                     <facets>
@@ -65,7 +65,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.chart.longitudinal_section" description="state.chart.logitudinal_section" state="de.intevation.flys.artifacts.states.DischargeLongitudinalSection">
+        <state id="state.chart.longitudinal_section" description="state.chart.logitudinal_section" state="org.dive4elements.river.artifacts.states.DischargeLongitudinalSection">
             <outputmodes>
                 <outputmode name="longitudinal_section" description="output.discharge_longitudinal_section" mime-type="image/png" type="chart">
                     <facets>
@@ -87,7 +87,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.chart.crosssection" description="state.chart.crosssection" state="de.intevation.flys.artifacts.states.WaterlevelState">
+        <state id="state.chart.crosssection" description="state.chart.crosssection" state="org.dive4elements.river.artifacts.states.WaterlevelState">
             <outputmodes>
                 <outputmode name="cross_section" description="output.cross_section" mime-type="image/png" type="chart">
                   <facets>
@@ -103,19 +103,19 @@
             </outputmodes>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.chart.km"/>
             <to state="state.chart.computeddischargecurve"/>
             <condition data="chart_type" value="chart.new.computeddischargecurve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.chart.km"/>
             <to state="state.chart.durationcurve"/>
             <condition data="chart_type" value="chart.new.durationcurve" operator="equal"/>
         </transition>
 
-        <state id="state.chart.computeddischargecurve" description="state.chart.computeddischargecurve" state="de.intevation.flys.artifacts.states.ComputedDischargeCurveState">
+        <state id="state.chart.computeddischargecurve" description="state.chart.computeddischargecurve" state="org.dive4elements.river.artifacts.states.ComputedDischargeCurveState">
             <outputmodes>
                 <outputmode name="computed_discharge_curve" description="output.computed_discharge_curve" mime-type="image/png" type="chart">
                     <facets>
@@ -133,7 +133,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.chart.durationcurve" description="state.chart.durationcurve" state="de.intevation.flys.artifacts.states.DurationCurveState">
+        <state id="state.chart.durationcurve" description="state.chart.durationcurve" state="org.dive4elements.river.artifacts.states.DurationCurveState">
             <outputmodes>
                 <outputmode name="duration_curve" description="output.duration_curve" mime-type="image/png" type="chart">
                     <facets>

--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,11 +3,11 @@
     <states>
         <state id="state.fix.river" description="state.fix.river"
             helpText="help.state.fix.river"
-            state="de.intevation.flys.artifacts.states.RiverSelect">
+            state="org.dive4elements.river.artifacts.states.RiverSelect">
             <data name="river" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.river"/>
             <to state="state.fix.calculation.mode"/>
         </transition>
@@ -15,66 +15,66 @@
         <state id="state.fix.calculation.mode"
             helpText="help.state.fix.calculation.mode"
             description="state.fix.calcuation.mode"
-            state="de.intevation.flys.artifacts.states.fixation.FixationSelect">
+            state="org.dive4elements.river.artifacts.states.fixation.FixationSelect">
             <data name="calculation.mode" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.calculation.mode"/>
             <to state="state.fix.location"/>
         </transition>
 
         <state id="state.fix.location" description="state.fix.location"
             helpText="help.state.fix.location"
-            state="de.intevation.flys.artifacts.states.fixation.LocationSelect">
+            state="org.dive4elements.river.artifacts.states.fixation.LocationSelect">
             <data name="ld_from" type="Double"/>
             <data name="ld_to" type="Double"/>
             <data name="ld_step" type="Double"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.location"/>
             <to state="state.fix.period"/>
         </transition>
 
         <state id="state.fix.period" description="state.fix.period"
             helpText="help.state.fix.period"
-            state="de.intevation.flys.artifacts.states.fixation.FixationPeriod">
+            state="org.dive4elements.river.artifacts.states.fixation.FixationPeriod">
             <data name="start" type="Long"/>
             <data name="end" type="Long"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.period"/>
             <to state="state.fix.gaugerange"/>
         </transition>
 
         <state id="state.fix.gaugerange" description="state.fix.gaugerange"
             helpText="help.state.fix.gaugerange"
-            state="de.intevation.flys.artifacts.states.fixation.GaugeRange">
+            state="org.dive4elements.river.artifacts.states.fixation.GaugeRange">
             <data name="q1" type="Integer"/>
             <data name="q2" type="Integer"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.gaugerange"/>
             <to state="state.fix.eventselect"/>
         </transition>
 
         <state id="state.fix.eventselect" description="state.fix.eventselect"
             helpText="help.state.fix.eventselect"
-            state="de.intevation.flys.artifacts.states.fixation.EventSelect">
+            state="org.dive4elements.river.artifacts.states.fixation.EventSelect">
             <data name="events" type="intarray"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.fix.eventselect"/>
             <to state="state.fix.analysis.referenceperiod"/>
             <condition data="calculation.mode" value="calculation.analysis"
                 operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.fix.eventselect"/>
             <to state="state.fix.vollmer.function"/>
             <condition data="calculation.mode" value="calculation.vollmer"
@@ -84,12 +84,12 @@
         <state id="state.fix.analysis.referenceperiod"
             helpText="help.state.fix.analysis.referenceperiod"
             description="state.fix.analysis.referenceperiod"
-            state="de.intevation.flys.artifacts.states.fixation.ReferencePeriod">
+            state="org.dive4elements.river.artifacts.states.fixation.ReferencePeriod">
             <data name="ref_start" type="Long"/>
             <data name="ref_end" type="Long"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.analysis.referenceperiod"/>
             <to state="state.fix.analysis.analysisperiods"/>
         </transition>
@@ -97,11 +97,11 @@
         <state id="state.fix.analysis.analysisperiods"
             helpText="help.state.fix.analysis.analysisperiods"
             description="state.fix.analysis.analysisperiods"
-            state="de.intevation.flys.artifacts.states.fixation.AnalysisPeriods">
+            state="org.dive4elements.river.artifacts.states.fixation.AnalysisPeriods">
             <data name="ana_data" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.analysis.analysisperiods"/>
             <to state="state.fix.analysis.function"/>
         </transition>
@@ -109,11 +109,11 @@
         <state id="state.fix.analysis.function"
             helpText="help.state.fix.analysis.function"
             description="state.fix.analysis.function"
-            state="de.intevation.flys.artifacts.states.fixation.FunctionSelect">
+            state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect">
             <data name="function" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.analysis.function"/>
             <to state="state.fix.analysis.preprocessing"/>
         </transition>
@@ -121,11 +121,11 @@
         <state id="state.fix.analysis.preprocessing"
             helpText="help.state.fix.analysis.preprocessing"
             description="state.fix.analysis.preprocessing"
-            state="de.intevation.flys.artifacts.states.fixation.PreprocessingSelect">
+            state="org.dive4elements.river.artifacts.states.fixation.PreprocessingSelect">
             <data name="preprocessing" type="Boolean"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.analysis.preprocessing"/>
             <to state="state.fix.analysis.compute"/>
         </transition>
@@ -133,7 +133,7 @@
         <state id="state.fix.analysis.compute"
             helpText="help.state.fix.analysis.compute"
             description="state.fix.analysis.compute"
-            state="de.intevation.flys.artifacts.states.fixation.FixAnalysisCompute">
+            state="org.dive4elements.river.artifacts.states.fixation.FixAnalysisCompute">
             <outputmodes>
                 <outputmode name="fix_deltawt_export" description="output.fix_deltawt_export" mine-type="text/plain" type="export">
                     <facets>
@@ -221,11 +221,11 @@
         <state id="state.fix.vollmer.function"
             helpText="help.state.fix.vollmer.function"
             description="state.fix.vollmer.function"
-            state="de.intevation.flys.artifacts.states.fixation.FunctionSelect">
+            state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect">
             <data name="function" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.vollmer.function"/>
             <to state="state.fix.vollmer.preprocessing"/>
         </transition>
@@ -233,23 +233,23 @@
         <state id="state.fix.vollmer.preprocessing"
             helpText="help.state.fix.vollmer.preprocessing"
             description="state.fix.vollmer.preprocessing"
-            state="de.intevation.flys.artifacts.states.fixation.PreprocessingSelect">
+            state="org.dive4elements.river.artifacts.states.fixation.PreprocessingSelect">
             <data name="preprocessing" type="Boolean"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.vollmer.preprocessing"/>
             <to state="state.fix.vollmer.qs"/>
         </transition>
 
         <state id="state.fix.vollmer.qs" description="state.fix.vollmer.qs"
             helpText="help.state.fix.vollmer.qs"
-            state="de.intevation.flys.artifacts.states.WQAdapted">
+            state="org.dive4elements.river.artifacts.states.WQAdapted">
             <data name="wq_isq"   type="String" />
             <data name="wq_values" type="WQTriple" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.fix.vollmer.qs"/>
             <to state="state.fix.vollmer.compute"/>
         </transition>
@@ -257,7 +257,7 @@
         <state id="state.fix.vollmer.compute"
             helpText="help.state.fix.vollmer.compute"
             description="state.fix.vollmer.compute"
-            state="de.intevation.flys.artifacts.states.fixation.FixRealizingCompute">
+            state="org.dive4elements.river.artifacts.states.fixation.FixRealizingCompute">
             <outputmodes>
                 <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
                     <facets>

--- a/flys-artifacts/doc/conf/artifacts/gaugedischarge.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/gaugedischarge.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
   <states>
     <state id="state.gaugedischarge.init"
                description="state.gaugedischarge.init"
-               state="de.intevation.flys.artifacts.states.GaugeDischargeState">
+               state="org.dive4elements.river.artifacts.states.GaugeDischargeState">
       <outputmodes>
         <outputmode name="computed_discharge_curve" description="computed_discharge_curve" mime-type="image/png" type="chart">
           <facets>

--- a/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="gaugedischargecurve">
     <states>
-         <state id="state.gaugedischargecurve.static" description="state.gaugedischargecurve.static" state="de.intevation.flys.artifacts.states.StaticState">
+         <state id="state.gaugedischargecurve.static" description="state.gaugedischargecurve.static" state="org.dive4elements.river.artifacts.states.StaticState">
             <data name="river" type="String" />
             <data name="reference_gauge" type="Long" />
             <data name="gauge_name" type="String" />

--- a/flys-artifacts/doc/conf/artifacts/hyk.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/hyk.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
   <states>
     <state id="state.hyk.static"
                description="state.hyk.static"
-               state="de.intevation.flys.artifacts.states.StaticHYKState">
+               state="org.dive4elements.river.artifacts.states.StaticHYKState">
       <outputmodes>
         <outputmode name="cross_section" description="output.cross_section" mime-type="image/png" type="chart">
           <facets>

--- a/flys-artifacts/doc/conf/artifacts/manualpoints.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/manualpoints.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
   <states>
     <state id="state.manualpoints.static"
                description="state.manualpoints.static"
-               state="de.intevation.flys.artifacts.states.ManualPointsSingleState">
+               state="org.dive4elements.river.artifacts.states.ManualPointsSingleState">
       <outputmodes>
         <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
           <facets>

--- a/flys-artifacts/doc/conf/artifacts/map.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/map.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="new_map">
     <states>
-         <state id="state.map.river" description="state.winfo.river" state="de.intevation.flys.artifacts.states.RiverSelect">
+         <state id="state.map.river" description="state.winfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect">
             <data name="river" type="String" />
          </state>
 
-         <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+         <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
              <from state="state.map.river"/>
              <to state="state.map.new"/>
          </transition>
 
-         <state id="state.map.new" description="state.map.new" state="de.intevation.flys.artifacts.MapArtifact$MapState">
+         <state id="state.map.new" description="state.map.new" state="org.dive4elements.river.artifacts.MapArtifact$MapState">
             <outputmodes>
                 <outputmode name="map" description="output.uesk.map.description" type="map">
                     <facets>

--- a/flys-artifacts/doc/conf/artifacts/minfo.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/minfo.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -2,145 +2,145 @@
 <artifact name="minfo">
 
     <states>
-        <state id="state.minfo.river" description="state.minfo.river" state="de.intevation.flys.artifacts.states.RiverSelect" helpText="help.state.minfo.river">
+        <state id="state.minfo.river" description="state.minfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect" helpText="help.state.minfo.river">
             <data name="river" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
                 <from state="state.minfo.river"/>
                 <to state="state.minfo.calculation_mode"/>
         </transition>
 
-        <state id="state.minfo.calculation_mode" description="state.minfo.calculation_mode" state="de.intevation.flys.artifacts.states.CalculationSelectMinfo" helpText="help.state.minfo.calculation_mode">
+        <state id="state.minfo.calculation_mode" description="state.minfo.calculation_mode" state="org.dive4elements.river.artifacts.states.CalculationSelectMinfo" helpText="help.state.minfo.calculation_mode">
             <data name="calculation_mode" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.calculation_mode"/>
             <to state="state.minfo.distance_only"/>
             <condition data="calculation_mode" value="calc.flow.velocity" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.calculation_mode"/>
             <to state="state.minfo.distance_only"/>
             <condition data="calculation_mode" value="calc.bed.middle" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.calculation_mode"/>
             <to state="state.minfo.sq.location"/>
             <condition data="calculation_mode" value="calc.sq.relation" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.calculation_mode"/>
             <to state="state.minfo.bed.year_epoch"/>
             <condition data="calculation_mode" value="calc.bed.diff" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.calculation_mode"/>
             <to state="state.minfo.bed.location"/>
             <condition data="calculation_mode" value="calc.bed.quality" operator="equal"/>
         </transition>
 
 
-        <state id="state.minfo.distance_only" description="state.minfo.distance_only" state="de.intevation.flys.artifacts.states.DistanceOnlySelect" helpText="help.state.minfo.distance_only">
+        <state id="state.minfo.distance_only" description="state.minfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.minfo.distance_only">
             <data name="ld_from" type="Double" />
             <data name="ld_to"   type="Double" />
         </state>
 
-        <state id="state.minfo.bed.year_epoch" description="state.minfo.bed.year_epoch" state="de.intevation.flys.artifacts.states.minfo.YearEpochSelect" helpText="help.state.minfo.bed.year_epoch">
+        <state id="state.minfo.bed.year_epoch" description="state.minfo.bed.year_epoch" state="org.dive4elements.river.artifacts.states.minfo.YearEpochSelect" helpText="help.state.minfo.bed.year_epoch">
             <data name="ye_select" type="String" />
         </state>
 
-        <state id="state.minfo.sq.location" description="state.minfo.sq.location" state="de.intevation.flys.artifacts.states.LocationSelect" helpText="help.state.minfo.sq.location">
+        <state id="state.minfo.sq.location" description="state.minfo.sq.location" state="org.dive4elements.river.artifacts.states.LocationSelect" helpText="help.state.minfo.sq.location">
             <data name="ld_locations" type="double"/>
         </state>
 
-        <state id="state.minfo.bed.location" description="state.minfo.bed.location" state="de.intevation.flys.artifacts.states.DistanceOnlySelect" helpText="help.state.minfo.bed.location">
+        <state id="state.minfo.bed.location" description="state.minfo.bed.location" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.minfo.bed.location">
             <data name="ld_from" type="Double" />
             <data name="ld_to" type="Double" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.distance_only"/>
             <to state="state.minfo.dischargestate"/>
             <condition data="calculation_mode" value="calc.flow.velocity" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.distance_only"/>
             <to state="state.minfo.soundings"/>
             <condition data="calculation_mode" value="calc.bed.middle" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sq.location"/>
             <to state="state.minfo.sq.period"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.bed.year_epoch"/>
             <to state="state.minfo.bed.difference_select"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.bed.location"/>
             <to state="state.minfo.bed.periods"/>
         </transition>
 
-        <state id="state.minfo.dischargestate" description="state.minfo.dischargestate" state="de.intevation.flys.artifacts.states.DischargeState" helpText="help.state.minfo.dischargestate">
+        <state id="state.minfo.dischargestate" description="state.minfo.dischargestate" state="org.dive4elements.river.artifacts.states.DischargeState" helpText="help.state.minfo.dischargestate">
             <data name="total_channel" type="intoptions"/>
             <data name="main_channel"  type="intoptions"/>
         </state>
 
-        <state id="state.minfo.soundings" description="state.minfo.soundingsstate" state="de.intevation.flys.artifacts.states.SoundingsSelect" helpText="help.state.minfo.soundings">
+        <state id="state.minfo.soundings" description="state.minfo.soundingsstate" state="org.dive4elements.river.artifacts.states.SoundingsSelect" helpText="help.state.minfo.soundings">
             <data name="soundings" type="options"/>
         </state>
 
-        <state id="state.minfo.sq.period" description="state.minfo.sq.period" state="de.intevation.flys.artifacts.states.sq.SQPeriodSelect"
+        <state id="state.minfo.sq.period" description="state.minfo.sq.period" state="org.dive4elements.river.artifacts.states.sq.SQPeriodSelect"
 				helpText="help.state.minfo.sq.period">
             <data name="start" type="Long"/>
             <data name="end"   type="Long"/>
         </state>
 
-        <state id="state.minfo.bed.difference_select" description="state.minfo.bed.difference_select" state="de.intevation.flys.artifacts.states.minfo.DifferenceSelect" helpText="help.state.minfo.bed.difference_select">
+        <state id="state.minfo.bed.difference_select" description="state.minfo.bed.difference_select" state="org.dive4elements.river.artifacts.states.minfo.DifferenceSelect" helpText="help.state.minfo.bed.difference_select">
             <data name="diffids" type="String" />
         </state>
 
-        <state id="state.minfo.bed.periods" description="state.minfo.bed.periods" state="de.intevation.flys.artifacts.states.minfo.BedQualityPeriodsSelect"
+        <state id="state.minfo.bed.periods" description="state.minfo.bed.periods" state="org.dive4elements.river.artifacts.states.minfo.BedQualityPeriodsSelect"
 				helpText="help.state.minfo.bed.periods">
             <data name="periods" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.dischargestate"/>
             <to state="state.minfo.flow_velocity"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.soundings"/>
             <to state="state.minfo.bedheight_middle"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sq.period"/>
             <to state="state.minfo.sq.outlier-method"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.bed.difference_select"/>
             <to state="state.minfo.bed.differences"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.bed.periods"/>
             <to state="state.minfo.bed.char_diameter"/>
         </transition>
 
-        <state id="state.minfo.flow_velocity" description="state.minfo.flow_velocity" state="de.intevation.flys.artifacts.states.FlowVelocityState" helpText="help.state.minfo.flow_velocity">
+        <state id="state.minfo.flow_velocity" description="state.minfo.flow_velocity" state="org.dive4elements.river.artifacts.states.FlowVelocityState" helpText="help.state.minfo.flow_velocity">
             <outputmodes>
                 <outputmode name="flow_velocity" description="output.flow_velocity" mime-type="image/png" type="chart">
                     <facets>
@@ -170,7 +170,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.minfo.bedheight_middle" description="state.minfo.bedheight_middle" state="de.intevation.flys.artifacts.states.MiddleBedHeight" helpText="help.state.minfo.bedheight_middle">
+        <state id="state.minfo.bedheight_middle" description="state.minfo.bedheight_middle" state="org.dive4elements.river.artifacts.states.MiddleBedHeight" helpText="help.state.minfo.bedheight_middle">
             <outputmodes>
                 <outputmode name="bedheight_middle" description="output.bedheight_middle" mime-type="image/png" type="chart">
                     <facets>
@@ -203,7 +203,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.minfo.bed.differences" description="state.minfo.bed.differences" state="de.intevation.flys.artifacts.states.minfo.DifferencesState" helpText="help.state.minfo.bed.differences">
+        <state id="state.minfo.bed.differences" description="state.minfo.bed.differences" state="org.dive4elements.river.artifacts.states.minfo.DifferencesState" helpText="help.state.minfo.bed.differences">
             <outputmodes>
                 <outputmode name="bed_difference_height_year" description="output.absolute_height" mime-type="image/png" type="chart">
                     <facets>
@@ -282,36 +282,36 @@
             </outputmodes>
         </state>
 
-        <state id="state.minfo.bed.char_diameter" description="state.minfo.bed.char_diameter" state="de.intevation.flys.artifacts.states.minfo.CharDiameter"
+        <state id="state.minfo.bed.char_diameter" description="state.minfo.bed.char_diameter" state="org.dive4elements.river.artifacts.states.minfo.CharDiameter"
 				helpText="help.state.minfo.bed.char_diameter">
             <data name="bed_diameter" type="options"/>
             <data name="load_diameter" type="options"/>
         </state>
 
-        <state id="state.minfo.sq.outlier-method" description="state.minfo.sq.outlier-method" state="de.intevation.flys.artifacts.states.sq.OutlierMethod" helpText="help.state.minfo.sq.outliermethod">
+        <state id="state.minfo.sq.outlier-method" description="state.minfo.sq.outlier-method" state="org.dive4elements.river.artifacts.states.sq.OutlierMethod" helpText="help.state.minfo.sq.outliermethod">
             <data name="outlier-method" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sq.outlier-method"/>
             <to state="state.minfo.sq.outliers"/>
         </transition>
 
-        <state id="state.minfo.sq.outliers" description="state.minfo.sq.outliers" state="de.intevation.flys.artifacts.states.OutliersInput" helpText="help.state.minfo.sq.outliers">
+        <state id="state.minfo.sq.outliers" description="state.minfo.sq.outliers" state="org.dive4elements.river.artifacts.states.OutliersInput" helpText="help.state.minfo.sq.outliers">
             <data name="outliers" type="Double"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.bed.char_diameter"/>
             <to state="state.minfo.bed.bed_quality"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sq.outliers"/>
             <to state="state.minfo.sq.relation"/>
         </transition>
 
-        <state id="state.minfo.sq.relation" description="state.minfo.sq.relation" state="de.intevation.flys.artifacts.states.SQRelation">
+        <state id="state.minfo.sq.relation" description="state.minfo.sq.relation" state="org.dive4elements.river.artifacts.states.SQRelation">
             <outputmodes>
                 <outputmode name="sq_relation_a" description="output.sq_relation" type="chart">
                     <facets>
@@ -387,7 +387,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.minfo.bed.bed_quality" description="state.minfo.bed.bed_quality" state="de.intevation.flys.artifacts.states.minfo.BedQualityState" helpText="help.state.minfo.bed.bed_quality">
+        <state id="state.minfo.bed.bed_quality" description="state.minfo.bed.bed_quality" state="org.dive4elements.river.artifacts.states.minfo.BedQualityState" helpText="help.state.minfo.bed.bed_quality">
             <outputmodes>
                 <outputmode name="bed_longitudinal_section" description="output.bed_longitudinal_section" mime-type="image/png" type="chart">
                     <facets>
@@ -411,86 +411,86 @@
         </state>
 
         <!-- sediment load config-->
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.calculation_mode"/>
             <to state="state.minfo.sediment.load.year_epoch"/>
             <condition data="calculation_mode" value="calc.sediment.load" operator="equal"/>
         </transition>
 
-        <state id="state.minfo.sediment.load.year_epoch" description="state.minfo.sediment.load.year_epoch" state="de.intevation.flys.artifacts.states.minfo.YearEpochSelect" helpText="help.state.minfo.sediment.load.year_epoch">
+        <state id="state.minfo.sediment.load.year_epoch" description="state.minfo.sediment.load.year_epoch" state="org.dive4elements.river.artifacts.states.minfo.YearEpochSelect" helpText="help.state.minfo.sediment.load.year_epoch">
             <data name="ye_select" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sediment.load.year_epoch"/>
             <to state="state.minfo.sediment.load.location"/>
         </transition>
 
-        <state id="state.minfo.sediment.load.location" description="state.minfo.distance_only" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadDistanceSelect" helpText="help.state.minfo.sediment.load.location">
+        <state id="state.minfo.sediment.load.location" description="state.minfo.distance_only" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadDistanceSelect" helpText="help.state.minfo.sediment.load.location">
             <data name="ld_from" type="Double" />
             <data name="ld_to"   type="Double" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.sediment.load.location"/>
             <to state="state.minfo.sediment.load.off_epochs"/>
             <condition data="ye_select" value="off_epoch" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.sediment.load.location"/>
             <to state="state.minfo.sediment.load.period"/>
             <condition data="ye_select" value="year" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.minfo.sediment.load.location"/>
             <to state="state.minfo.sediment.load.epochs"/>
             <condition data="ye_select" value="epoch" operator="equal"/>
         </transition>
 
-        <state id="state.minfo.sediment.load.period" description="state.minfo.bed.period" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadYearSelect"
+        <state id="state.minfo.sediment.load.period" description="state.minfo.bed.period" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadYearSelect"
 				helpText="help.state.minfo.sediment.load.period">
             <data name="start" type="Integer"/>
             <data name="end" type="Integer"/>
         </state>
 
-        <state id="state.minfo.sediment.load.epochs" description="state.minfo.bed.epochs" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadEpochSelect"
+        <state id="state.minfo.sediment.load.epochs" description="state.minfo.bed.epochs" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadEpochSelect"
 				helpText="help.state.minfo.sediment.load.epochs">
             <data name="epochs" type="String"/>
         </state>
 
-        <state id="state.minfo.sediment.load.off_epochs" description="state.minfo.bed.off_epochs" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadOffEpochSelect"
+        <state id="state.minfo.sediment.load.off_epochs" description="state.minfo.bed.off_epochs" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadOffEpochSelect"
 				helpText="help.state.minfo.sediment.load.off_epochs">
             <data name="epochs" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sediment.load.period"/>
             <to state="state.minfo.sediment.load.unit"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sediment.load.epochs"/>
             <to state="state.minfo.sediment.load.unit"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sediment.load.off_epochs"/>
             <to state="state.minfo.sediment.load.unit"/>
         </transition>
 
-        <state id="state.minfo.sediment.load.unit" description="state.minfo.sediment.load.unit" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadUnit"
+        <state id="state.minfo.sediment.load.unit" description="state.minfo.sediment.load.unit" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadUnit"
 				helpText="help.state.minfo.sediment.load.unit">
             <data name="unit" type="String"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.minfo.sediment.load.unit"/>
             <to state="state.minfo.sediment.load.calculate"/>
         </transition>
 
-        <state id="state.minfo.sediment.load.calculate" description="state.minfo.sediment.load.calculate" state="de.intevation.flys.artifacts.states.minfo.SedimentLoadCalculate">
+        <state id="state.minfo.sediment.load.calculate" description="state.minfo.sediment.load.calculate" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadCalculate">
             <outputmodes>
                 <outputmode name="sedimentload_ls" description="output.sedimentload.ls" mime-type="image/png" type="chart">
                     <facets>

--- a/flys-artifacts/doc/conf/artifacts/qsector.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/qsector.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
   <states>
     <state id="state.qsector.static"
                description="state.qsector.static"
-               state="de.intevation.flys.artifacts.states.QSectorSingleState">
+               state="org.dive4elements.river.artifacts.states.QSectorSingleState">
       <outputmodes>
         <outputmode name="fix_wq_curve" description="output.fix_wq_curve" mime-type="image/png" type="chart">
           <facets>

--- a/flys-artifacts/doc/conf/artifacts/sqrelation.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/sqrelation.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <artifact name="staticsqrelation">
     <states>
-         <state id="state.sqrelation.static" description="state.sqrelation.static" state="de.intevation.flys.artifacts.states.sq.SQStaticState">
+         <state id="state.sqrelation.static" description="state.sqrelation.static" state="org.dive4elements.river.artifacts.states.sq.SQStaticState">
             <data name="river" type="String" />
             <data name="station" type="String" />
             <outputmodes>

--- a/flys-artifacts/doc/conf/artifacts/staticwqkms.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/staticwqkms.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
   <states>
     <state id="state.staticwqkms.static"
                description="state.staticwqkms.state"
-               state="de.intevation.flys.artifacts.states.StaticWQKmsState">
+               state="org.dive4elements.river.artifacts.states.StaticWQKmsState">
       <outputmodes>
         <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
           <facets>

--- a/flys-artifacts/doc/conf/artifacts/waterlevel.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/waterlevel.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
     <states>
         <state id="state.waterlevel.done"
                description="state.waterlevel.done"
-               state="de.intevation.flys.artifacts.states.WaterlevelInfoState">
+               state="org.dive4elements.river.artifacts.states.WaterlevelInfoState">
            <outputmodes>
              <outputmode name="w_differences" description="output.w_differences" mime-type="image/png" type="chart">
                   <facets>

--- a/flys-artifacts/doc/conf/artifacts/winfo.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/winfo.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -2,79 +2,79 @@
 <artifact name="winfo">
     <states>
 
-        <state id="state.winfo.river" description="state.winfo.river" state="de.intevation.flys.artifacts.states.RiverSelect" helpText="help.state.winfo.river">
+        <state id="state.winfo.river" description="state.winfo.river" state="org.dive4elements.river.artifacts.states.RiverSelect" helpText="help.state.winfo.river">
             <data name="river" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.river"/>
             <to state="state.winfo.calculation_mode"/>
         </transition>
 
-        <state id="state.winfo.calculation_mode" description="state.winfo.calculation_mode" state="de.intevation.flys.artifacts.states.CalculationSelect" helpText="help.state.winfo.calculation_mode">
+        <state id="state.winfo.calculation_mode" description="state.winfo.calculation_mode" state="org.dive4elements.river.artifacts.states.CalculationSelect" helpText="help.state.winfo.calculation_mode">
             <data name="calculation_mode" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.location_distance"/>
             <condition data="calculation_mode" value="calc.surface.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.distance_only"/>
             <condition data="calculation_mode" value="calc.flood.map" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.location"/>
             <condition data="calculation_mode" value="calc.discharge.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.location"/>
             <condition data="calculation_mode" value="calc.duration.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.distance"/>
             <condition data="calculation_mode" value="calc.discharge.longitudinal.section" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.waterlevel_pair_select"/>
             <condition data="calculation_mode" value="calc.w.differences" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.historicalq.reference_gauge"/>
             <condition data="calculation_mode" value="calc.historical.discharge.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.location_distance"/>
             <condition data="calculation_mode" value="calc.extreme.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.waterlevel_pair_select"/>
             <to state="state.winfo.w_differences"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.calculation_mode"/>
             <to state="state.winfo.reference.curve.input.start"/>
             <condition data="calculation_mode" value="calc.reference.curve" operator="equal"/>
         </transition>
 
-        <state id="state.winfo.location" description="state.winfo.location" state="de.intevation.flys.artifacts.states.LocationSelect" helpText="help.state.winfo.location">
+        <state id="state.winfo.location" description="state.winfo.location" state="org.dive4elements.river.artifacts.states.LocationSelect" helpText="help.state.winfo.location">
             <data name="ld_locations" type="Double[]" />
 
             <!--
@@ -91,12 +91,12 @@
             -->
         </state>
 
-        <state id="state.winfo.distance_only" description="state.winfo.distance_only" state="de.intevation.flys.artifacts.states.DistanceOnlySelect" helpText="help.state.winfo.distance_only">
+        <state id="state.winfo.distance_only" description="state.winfo.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.winfo.distance_only">
             <data name="ld_from" type="Double" />
             <data name="ld_to"   type="Double" />
         </state>
 
-        <state id="state.winfo.distance" description="state.winfo.distance" state="de.intevation.flys.artifacts.states.DistanceSelect" helpText="help.state.winfo.distance">
+        <state id="state.winfo.distance" description="state.winfo.distance" state="org.dive4elements.river.artifacts.states.DistanceSelect" helpText="help.state.winfo.distance">
             <data name="ld_from" type="Double" />
             <data name="ld_to"   type="Double" />
             <data name="ld_step" type="Double" />
@@ -115,12 +115,12 @@
             -->
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.distance_only"/>
             <to state="state.winfo.uesk.wsp"/>
         </transition>
 
-        <state id="state.winfo.location_distance" description="state.winfo.location_distance" state="de.intevation.flys.artifacts.states.LocationDistanceSelect" helpText="help.state.winfo.location_distance">
+        <state id="state.winfo.location_distance" description="state.winfo.location_distance" state="org.dive4elements.river.artifacts.states.LocationDistanceSelect" helpText="help.state.winfo.location_distance">
             <data name="ld_mode" type="String" />
             <data name="ld_locations" type="Double[]" />
             <data name="ld_from" type="Double" />
@@ -141,53 +141,53 @@
             -->
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.distance"/>
             <to state="state.winfo.wq_adapted"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.location_distance"/>
             <to state="state.winfo.function_select"/>
             <condition data="calculation_mode" value="calc.extreme.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.location_distance"/>
             <to state="state.winfo.wq"/>
             <condition data="calculation_mode" value="calc.extreme.curve" operator="notequal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.location"/>
             <to state="state.winfo.durationcurve"/>
             <condition data="calculation_mode" value="calc.duration.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.location"/>
             <to state="state.winfo.computeddischargecurve"/>
             <condition data="calculation_mode" value="calc.discharge.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.function_select"/>
             <to state="state.winfo.extreme.percent"/>
             <condition data="calculation_mode" value="calc.extreme.curve" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.extreme.percent"/>
             <to state="state.winfo.extreme.qinput"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.extreme.qinput"/>
             <to state="state.winfo.extreme.curve"/>
         </transition>
 
 
-        <state id="state.winfo.wq" description="state.winfo.wq" state="de.intevation.flys.artifacts.states.WQSelect" helpText="help.state.winfo.wq">
+        <state id="state.winfo.wq" description="state.winfo.wq" state="org.dive4elements.river.artifacts.states.WQSelect" helpText="help.state.winfo.wq">
             <data name="wq_isq" type="Boolean" />
             <data name="wq_isfree" type="Boolean" />
             <data name="wq_isrange" type="Boolean" />
@@ -198,35 +198,35 @@
         </state>
 
         <state id="state.winfo.wq_adapted" description="state.winfo.wq_adapted"
-               state="de.intevation.flys.artifacts.states.WQAdapted" helpText="help.state.winfo.wq_adapted">
+               state="org.dive4elements.river.artifacts.states.WQAdapted" helpText="help.state.winfo.wq_adapted">
             <!-- TODO Add data objects -->
             <data name="wq_isq"   type="String" />
             <data name="wq_values" type="WQTriple" />
         </state>
 
-        <state id="state.winfo.waterlevel_pair_select" description="state.winfo.waterlevel_pair_select" state="de.intevation.flys.artifacts.states.WaterlevelPairSelectState" helpText="help.state.winfo.waterlevel_pair_select">
+        <state id="state.winfo.waterlevel_pair_select" description="state.winfo.waterlevel_pair_select" state="org.dive4elements.river.artifacts.states.WaterlevelPairSelectState" helpText="help.state.winfo.waterlevel_pair_select">
             <data name="diffids" type="String" />
         </state>
 
-        <state id="state.winfo.reference.curve.input.start" description="state.winfo.reference.curve.input (start)" state="de.intevation.flys.artifacts.states.EnterLocationState" helpText="help.state.winfo.reference.curve.input.start">
+        <state id="state.winfo.reference.curve.input.start" description="state.winfo.reference.curve.input (start)" state="org.dive4elements.river.artifacts.states.EnterLocationState" helpText="help.state.winfo.reference.curve.input.start">
             <data name="reference_startpoint" type="Double[]"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.reference.curve.input.start"/>
             <to   state="state.winfo.reference.curve.input.end"/>
         </transition>
 
-        <state id="state.winfo.reference.curve.input.end" description="state.winfo.reference.curve.input (end)" state="de.intevation.flys.artifacts.states.EnterMultipleLocationsState" helpText="help.state.winfo.reference.curve.input.end">
+        <state id="state.winfo.reference.curve.input.end" description="state.winfo.reference.curve.input (end)" state="org.dive4elements.river.artifacts.states.EnterMultipleLocationsState" helpText="help.state.winfo.reference.curve.input.end">
             <data name="reference_endpoint" type="Double[]"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.reference.curve.input.end"/>
             <to state="state.winfo.reference.curve"/>
         </transition>
 
-        <state id="state.winfo.reference.curve" description="state.winfo.reference.curve" state="de.intevation.flys.artifacts.states.ReferenceCurveState" helpText="help.state.winfo.reference.curve">
+        <state id="state.winfo.reference.curve" description="state.winfo.reference.curve" state="org.dive4elements.river.artifacts.states.ReferenceCurveState" helpText="help.state.winfo.reference.curve">
             <outputmodes>
                 <outputmode name="reference_curve_normalized" mime-type="image/png" type="chart">
                     <facets>
@@ -256,7 +256,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.winfo.w_differences" description="state.winfo.w_differences" state="de.intevation.flys.artifacts.states.WDifferencesState" helpText="help.state.winfo.w_differences">
+        <state id="state.winfo.w_differences" description="state.winfo.w_differences" state="org.dive4elements.river.artifacts.states.WDifferencesState" helpText="help.state.winfo.w_differences">
 
             <outputmodes>
                 <outputmode name="w_differences" description="output.w_differences" mime-type="image/png" type="chart">
@@ -280,7 +280,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.winfo.durationcurve" description="state.winfo.durationcurve" state="de.intevation.flys.artifacts.states.DurationCurveState" helpText="help.state.winfo.durationcurve">
+        <state id="state.winfo.durationcurve" description="state.winfo.durationcurve" state="org.dive4elements.river.artifacts.states.DurationCurveState" helpText="help.state.winfo.durationcurve">
             <outputmodes>
                 <outputmode name="duration_curve" description="output.duration_curve" mime-type="image/png" type="chart">
                     <facets>
@@ -307,7 +307,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.winfo.computeddischargecurve" description="state.winfo.computeddischargecurve" state="de.intevation.flys.artifacts.states.ComputedDischargeCurveState" helpText="help.state.winfo.computeddischargecurve">
+        <state id="state.winfo.computeddischargecurve" description="state.winfo.computeddischargecurve" state="org.dive4elements.river.artifacts.states.ComputedDischargeCurveState" helpText="help.state.winfo.computeddischargecurve">
             <outputmodes>
                 <outputmode name="computed_discharge_curve" description="output.computed_discharge_curve" mime-type="image/png" type="chart">
                     <facets>
@@ -342,17 +342,17 @@
             </outputmodes>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.wq"/>
             <to state="state.winfo.waterlevel"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.wq_adapted"/>
             <to state="state.winfo.discharge_longitudinal_section"/>
         </transition>
 
-        <state id="state.winfo.waterlevel" description="state.winfo.waterlevel" state="de.intevation.flys.artifacts.states.WaterlevelState" helpText="help.state.winfo.waterlevel">
+        <state id="state.winfo.waterlevel" description="state.winfo.waterlevel" state="org.dive4elements.river.artifacts.states.WaterlevelState" helpText="help.state.winfo.waterlevel">
             <outputmodes>
                 <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
                   <facets>
@@ -396,7 +396,7 @@
             </outputmodes>
         </state>
 
-        <state id="state.winfo.discharge_longitudinal_section" description="state.winfo.discharge_longitudinal_section" state="de.intevation.flys.artifacts.states.DischargeLongitudinalSection" helpText="help.state.winfo.discharge_longitudinal_section">
+        <state id="state.winfo.discharge_longitudinal_section" description="state.winfo.discharge_longitudinal_section" state="org.dive4elements.river.artifacts.states.DischargeLongitudinalSection" helpText="help.state.winfo.discharge_longitudinal_section">
             <outputmodes>
                 <outputmode name="discharge_longitudinal_section" description="output.discharge_longitudinal_section" mime-type="image/png" type="chart">
                     <facets>
@@ -442,108 +442,108 @@
             </outputmodes>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.waterlevel"/>
             <to state="state.winfo.uesk.dgm"/>
         </transition>
 
-        <state id="state.winfo.uesk.wsp" description="state.winfo.uesk.wsp" state="de.intevation.flys.artifacts.states.WaterlevelSelectState" helpText="help.state.winfo.uesk.wsp">
+        <state id="state.winfo.uesk.wsp" description="state.winfo.uesk.wsp" state="org.dive4elements.river.artifacts.states.WaterlevelSelectState" helpText="help.state.winfo.uesk.wsp">
             <data name="wsp" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.wsp"/>
             <to state="state.winfo.uesk.dgm"/>
         </transition>
 
-        <state id="state.winfo.uesk.dgm" description="state.winfo.uesk.dgm" state="de.intevation.flys.artifacts.states.DGMSelect" helpText="help.state.winfo.uesk.dgm">
+        <state id="state.winfo.uesk.dgm" description="state.winfo.uesk.dgm" state="org.dive4elements.river.artifacts.states.DGMSelect" helpText="help.state.winfo.uesk.dgm">
             <data name="dgm" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.dgm"/>
             <to state="state.winfo.uesk.profiles"/>
         </transition>
 
-        <state id="state.winfo.uesk.profiles" description="state.winfo.uesk.profiles" state="de.intevation.flys.artifacts.states.ProfileDistanceSelect" helpText="help.state.winfo.uesk.profiles">
+        <state id="state.winfo.uesk.profiles" description="state.winfo.uesk.profiles" state="org.dive4elements.river.artifacts.states.ProfileDistanceSelect" helpText="help.state.winfo.uesk.profiles">
             <data name="profile_distance" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.profiles"/>
             <to state="state.winfo.uesk.floodplain"/>
         </transition>
 
-        <state id="state.winfo.uesk.floodplain" description="state.winfo.uesk.floodplain.description" state="de.intevation.flys.artifacts.states.FloodplainChoice" helpText="help.state.winfo.uesk.floodplain">
+        <state id="state.winfo.uesk.floodplain" description="state.winfo.uesk.floodplain.description" state="org.dive4elements.river.artifacts.states.FloodplainChoice" helpText="help.state.winfo.uesk.floodplain">
             <data name="use_floodplain" type="Boolean" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.floodplain"/>
             <to state="state.winfo.uesk.differences"/>
         </transition>
 
-        <state id="state.winfo.uesk.differences" description="state.winfo.uesk.differences" state="de.intevation.flys.artifacts.states.WaterlevelGroundDifferences" helpText="help.state.winfo.uesk.differences">
+        <state id="state.winfo.uesk.differences" description="state.winfo.uesk.differences" state="org.dive4elements.river.artifacts.states.WaterlevelGroundDifferences" helpText="help.state.winfo.uesk.differences">
             <data name="diff_from" type="Double" />
             <data name="diff_to"   type="Double" />
             <data name="diff_diff" type="Double" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.differences"/>
             <to state="state.winfo.uesk.scenario"/>
         </transition>
 
-        <state id="state.winfo.uesk.scenario" description="state.winfo.uesk.scenario" state="de.intevation.flys.artifacts.states.ScenarioSelect" helpText="help.state.winfo.uesk.scenario">
+        <state id="state.winfo.uesk.scenario" description="state.winfo.uesk.scenario" state="org.dive4elements.river.artifacts.states.ScenarioSelect" helpText="help.state.winfo.uesk.scenario">
             <data name="scenario" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.uesk.scenario"/>
             <to state="state.winfo.uesk.uesk"/>
             <condition data="scenario" value="scenario.current" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.uesk.scenario"/>
             <to state="state.winfo.uesk.uesk"/>
             <condition data="scenario" value="scenario.potentiel" operator="equal"/>
         </transition>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
             <from state="state.winfo.uesk.scenario"/>
             <to state="state.winfo.uesk.dc-hws"/>
             <condition data="scenario" value="scenario.scenario" operator="equal"/>
         </transition>
 
-        <state id="state.winfo.uesk.dc-hws" description="state.winfo.uesk.dc-hws" state="de.intevation.flys.artifacts.states.HWSDatacageState" helpText="help.state.winfo.uesk.dc-hws">
+        <state id="state.winfo.uesk.dc-hws" description="state.winfo.uesk.dc-hws" state="org.dive4elements.river.artifacts.states.HWSDatacageState" helpText="help.state.winfo.uesk.dc-hws">
             <data name="uesk.hws" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.dc-hws" />
             <to state="state.winfo.uesk.user-rgd" />
         </transition>
 
-        <state id="state.winfo.uesk.user-rgd" description="state.winfo.uesk.user-rgd" state="de.intevation.flys.artifacts.states.UserRGDState" helpText="help.state.winfo.uesk.user-rgd">
+        <state id="state.winfo.uesk.user-rgd" description="state.winfo.uesk.user-rgd" state="org.dive4elements.river.artifacts.states.UserRGDState" helpText="help.state.winfo.uesk.user-rgd">
             <data name="uesk.user-rgd" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.user-rgd" />
             <to state="state.winfo.uesk.barriers" />
         </transition>
 
-        <state id="state.winfo.uesk.barriers" description="state.winfo.uesk.barriers" state="de.intevation.flys.artifacts.states.HWSBarriersState" helpText="help.state.winfo.uesk.barriers">
+        <state id="state.winfo.uesk.barriers" description="state.winfo.uesk.barriers" state="org.dive4elements.river.artifacts.states.HWSBarriersState" helpText="help.state.winfo.uesk.barriers">
             <data name="uesk.barriers" type="String" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.uesk.barriers" />
             <to state="state.winfo.uesk.uesk" />
         </transition>
 
-        <state id="state.winfo.uesk.uesk" description="state.winfo.uesk.uesk" state="de.intevation.flys.artifacts.states.FloodMapState" helpText="help.state.winfo.uesk.uesk">
+        <state id="state.winfo.uesk.uesk" description="state.winfo.uesk.uesk" state="org.dive4elements.river.artifacts.states.FloodMapState" helpText="help.state.winfo.uesk.uesk">
             <outputmodes>
                 <outputmode name="floodmap" description="output.uesk.map.description" type="map">
                     <facets>
@@ -580,35 +580,35 @@
 
 
         <!-- path for historical discharge curves -->
-        <state id="state.winfo.historicalq.reference_gauge" description="state.winfo.historicalq.reference_gauge" state="de.intevation.flys.artifacts.states.ReferenceGaugeState" helpText="help.state.winfo.historicalq.reference_gauge">
+        <state id="state.winfo.historicalq.reference_gauge" description="state.winfo.historicalq.reference_gauge" state="org.dive4elements.river.artifacts.states.ReferenceGaugeState" helpText="help.state.winfo.historicalq.reference_gauge">
             <data name="reference_gauge" type="Integer" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.historicalq.reference_gauge"/>
             <to state="state.winfo.historicalq.timerange"/>
         </transition>
 
-        <state id="state.winfo.historicalq.timerange" description="state.winfo.historicalq.timerange" state="de.intevation.flys.artifacts.states.GaugeTimerangeState" helpText="help.state.winfo.historicalq.timerange">
+        <state id="state.winfo.historicalq.timerange" description="state.winfo.historicalq.timerange" state="org.dive4elements.river.artifacts.states.GaugeTimerangeState" helpText="help.state.winfo.historicalq.timerange">
             <data name="year_range" type="longrange"/>
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.historicalq.timerange"/>
             <to state="state.winfo.historicalq.mode"/>
         </transition>
 
-        <state id="state.winfo.historicalq.mode" description="state.winfo.historicalq.mode" state="de.intevation.flys.artifacts.states.HistoricalDischargeState" helpText="help.state.winfo.historicalq.mode">
+        <state id="state.winfo.historicalq.mode" description="state.winfo.historicalq.mode" state="org.dive4elements.river.artifacts.states.HistoricalDischargeState" helpText="help.state.winfo.historicalq.mode">
             <data name="historical_mode" type="intoptions" />
             <data name="historical_values" type="doublearray" />
         </state>
 
-        <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition">
+        <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
             <from state="state.winfo.historicalq.mode"/>
             <to state="state.winfo.historicalq.compute"/>
         </transition>
 
-        <state id="state.winfo.historicalq.compute" description="state.winfo.historicalq.compute" state="de.intevation.flys.artifacts.states.HistoricalDischargeComputeState" helpText="help.state.winfo.historicalq.compute">
+        <state id="state.winfo.historicalq.compute" description="state.winfo.historicalq.compute" state="org.dive4elements.river.artifacts.states.HistoricalDischargeComputeState" helpText="help.state.winfo.historicalq.compute">
             <outputmodes>
                 <outputmode name="historical_discharge" description="output.historical_discharge.description" mime-type="image/png" type="chart">
                     <facets>
@@ -645,26 +645,26 @@
 
         <state id="state.winfo.function_select"
             description="state.winfo.function_select"
-            state="de.intevation.flys.artifacts.states.fixation.FunctionSelect"
+            state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect"
 			helpText="help.state.winfo.function_select">
             <data name="function" type="String"/>
         </state>
 
         <state id="state.winfo.extreme.percent"
             description="state.winfo.extreme.percent"
-            state="de.intevation.flys.artifacts.states.extreme.PercentInput"
+            state="org.dive4elements.river.artifacts.states.extreme.PercentInput"
 			helpText="help.state.winfo.extreme.percent">
             <data name="percent" type="Double"/>
         </state>
 
         <state id="state.winfo.extreme.qinput"
             description="state.winfo.extreme.qinput"
-            state="de.intevation.flys.artifacts.states.extreme.ExtremeQInput"
+            state="org.dive4elements.river.artifacts.states.extreme.ExtremeQInput"
 			helpText="help.state.winfo.extreme.qinput">
             <data name="ranges" type="Double[]"/>
         </state>
 
-        <state id="state.winfo.extreme.curve" description="state.winfo.extreme.curve" state="de.intevation.flys.artifacts.states.extreme.ExtremeCompute" helpText="help.state.winfo.extreme.curve">
+        <state id="state.winfo.extreme.curve" description="state.winfo.extreme.curve" state="org.dive4elements.river.artifacts.states.extreme.ExtremeCompute" helpText="help.state.winfo.extreme.curve">
             <outputmodes>
                 <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png" type="chart">
                   <facets>

--- a/flys-artifacts/doc/conf/artifacts/wmsbackground.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/artifacts/wmsbackground.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -3,7 +3,7 @@
     <states>
         <state id="state.wmsbackground.layer"
                description="state.wmsbackground.layer.description"
-               state="de.intevation.flys.artifacts.states.WMSBackgroundState">
+               state="org.dive4elements.river.artifacts.states.WMSBackgroundState">
             <outputmodes>
                 <outputmode name="floodmap" description="output.uesk.map.description" type="map">
                     <facets>

--- a/flys-artifacts/doc/conf/conf.xml	Thu Apr 25 12:25:11 2013 +0200
+++ b/flys-artifacts/doc/conf/conf.xml	Thu Apr 25 12:26:40 2013 +0200
@@ -11,239 +11,239 @@
 <artifact-database>
     <export-secret>YOUR_SECRET</export-secret>
     <factories>
-        <context-factory>de.intevation.flys.artifacts.context.FLYSContextFactory</context-factory>
+        <context-factory>org.dive4elements.river.artifacts.context.FLYSContextFactory</context-factory>
 
         <collection-factory
             name="DefaultArtifactCollectionFactory"
             description="The default artifact collection factory"
             ttl="21600000"
-            artifact-collection="de.intevation.flys.collections.FLYSArtifactCollection">de.intevation.artifactdatabase.DefaultArtifactCollectionFactory</collection-factory>
+            artifact-collection="org.dive4elements.river.collections.FLYSArtifactCollection">org.dive4elements.artifactdatabase.DefaultArtifactCollectionFactory</collection-factory>
 
         <artifact-factories>
             <!-- All Artifactfactories which are available in this Database. -->
             <artifact-factory name="winfo" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WINFOArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WINFOArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="riveraxis" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.RiverAxisArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.RiverAxisArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="hyk" description="Factory to create an artifact to be used for hyks"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.HYKArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.HYKArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="new_map" description="Factory to create an artifact to be used for new map"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.MapArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.MapArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmskmfactory" description="Factory to create an artifact that generates WMS facets for KMs."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSKmArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSKmArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsqpsfactory" description="Factory to create an artifact that generates WMS facets for CrossSectionTracks."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSQPSArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSQPSArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmshydrboundariesfactory" description="Factory to create an artifact that generates WMS facets for CrossSectionTracks."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSHydrBoundaryArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSHydrBoundaryArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmshydrboundariespolyfactory" description="Factory to create an artifact that generates WMS facets for CrossSectionTracks."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSHydrBoundaryPolyArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSHydrBoundaryPolyArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsfloodplainfactory" description="Factory to create an artifact that generates WMS facets for CrossSectionTracks."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSFloodplainArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSFloodplainArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsbuildingsfactory" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSBuildingsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSBuildingsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsfixpointsfactory" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSFixpointsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSFixpointsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsfloodmarkfactory" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSFloodmarksArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSFloodmarksArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsfloodmapsfactory" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSFloodmapsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSFloodmapsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsgaugelocationfactory" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSGaugeLocationArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSGaugeLocationArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsbackground" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSBackgroundArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSBackgroundArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="externalwmsfactory" description="Factory to create an artifact to be used in Floodmaps to display external WMS layers"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.ExternalWMSArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.ExternalWMSArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="annotations" description="Factory to create an artifact to access Annotations for Points at rivers"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.AnnotationArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.AnnotationArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="crosssections" description="Factory to create an artifact to access cross sections"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.CrossSectionArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.CrossSectionArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="waterlevel" description="Factory to create an artifact to access waterlevel data"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WaterlevelArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WaterlevelArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="mainvalue" description="Factory to create an artifact to access Main Values for discharge curve diagrams"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.MainValuesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.MainValuesArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="staticwkms" description="Factory to create an artifact to access 'other' WKms data"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.StaticWKmsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.StaticWKmsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="area" description="Factory to create an artifact to draw (wkms) area data"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.AreaArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.AreaArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="staticwqkms" description="Factory to create an artifact to access 'other' WKms data"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.StaticWQKmsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.StaticWQKmsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wqinterpol" description="Factory to create an artifact to access 'other' WQ (at km) data"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WQKmsInterpolArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WQKmsInterpolArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="new_chart" description="Factory to create an artifact to be used for new chart"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.ChartArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.ChartArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="manualpoints" description="Factory to create an artifact for storing and editing points added by the user."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.ManualPointsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.ManualPointsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="fixanalysis" description="Factory to create an artifact to be used in fixation analysis."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.FixationArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.FixationArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="gaugedischarge" description="Factory to create an artifact to host historical qs."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.GaugeDischargeArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.GaugeDischargeArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="qsectors" description="Factory to create an artifact to host qsectors."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.QSectorArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.QSectorArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmshwslinesfactory" description="Factory to create an artifact that generates WMS facets for HWS Lines"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSHWSLinesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSHWSLinesArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmshwspointsfactory" description="Factory to create an artifact that generates WMS facets for HWS Points"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSHWSPointsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSHWSPointsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="wmsjettiesfactory" description="Factory to create an artifact to be used in WINFO"
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.WMSJettiesArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.WMSJettiesArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
 
             <!-- MINFO specific Artifacts -->
             <artifact-factory name="minfo" description="Factory to create an artifact to be used in module minfo."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.MINFOArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.MINFOArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="bedheight" description="Factory to create an artifact used in minfo datacage."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.BedHeightsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.BedHeightsArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="staticsqrelation" description="Factory to create an artifact that generates sq relations from db."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.SQRelationArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.SQRelationArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="morph-width" description="Factory to create an artifact used in minfo datacage."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.StaticMorphWidthArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.StaticMorphWidthArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
 
             <artifact-factory name="gaugedischargecurve" description="Factory to create an artifact to show a discharge curve for a gauge."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.GaugeDischargeCurveArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.GaugeDischargeCurveArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
             <artifact-factory name="flowvelocity" description="Factory to create an artifact to show measured flow velocities."
                 ttl="3600000"
-                artifact="de.intevation.flys.artifacts.FlowVelocityMeasurementArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
+                artifact="org.dive4elements.river.artifacts.FlowVelocityMeasurementArtifact">org.dive4elements.artifactdatabase.DefaultArtifactFactory</artifact-factory>
         </artifact-factories>
 
-        <user-factory name="default" description="Factory to create new users">de.intevation.artifactdatabase.DefaultUserFactory</user-factory>
+        <user-factory name="default" description="Factory to create new users">org.dive4elements.artifactdatabase.DefaultUserFactory</user-factory>
 
         <service-factories>
             <service-factory
                 name="rivers"
-                service="de.intevation.flys.artifacts.services.RiverService"
-                description="This service returns a list of provided rivers by the artifact server.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.RiverService"
+                description="This service returns a list of provided rivers by the artifact server.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="distanceinfo"
-                service="de.intevation.flys.artifacts.services.DistanceInfoService"
-                description="Returns a list of distances supported by a specific river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.DistanceInfoService"
+                description="Returns a list of distances supported by a specific river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="mainvalues"
-                service="de.intevation.flys.artifacts.services.MainValuesService"
-                description="Returns the main values of a river's gauge based on a start and end point of the river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.MainValuesService"
+                description="Returns the main values of a river's gauge based on a start and end point of the river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="metadata"
-                service="de.intevation.flys.artifacts.services.MetaDataService"
-                description="The service provides some introspection into the database content.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.MetaDataService"
+                description="The service provides some introspection into the database content.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="mapinfo"
-                service="de.intevation.flys.artifacts.services.MapInfoService"
-                description="The service provides some basic information to create a WMS for a specific river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.MapInfoService"
+                description="The service provides some basic information to create a WMS for a specific river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="cross-section-km"
-                service="de.intevation.flys.artifacts.services.CrossSectionKMService"
-                description="The service provides the N next neighbored kms and ids of cross section lines for given cross section id, km and N.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.CrossSectionKMService"
+                description="The service provides the N next neighbored kms and ids of cross section lines for given cross section id, km and N.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="cache-invalidation"
-                service="de.intevation.flys.artifacts.services.CacheInvalidationService"
-                description="The service invalidates caches.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.CacheInvalidationService"
+                description="The service invalidates caches.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="dischargeinfo"
-                service="de.intevation.flys.artifacts.services.DischargeInfoService"
-                description="Returns description, start year and end year of discharges at a specific gauge.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.DischargeInfoService"
+                description="Returns description, start year and end year of discharges at a specific gauge.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="fixings-overview"
-                service="de.intevation.flys.artifacts.services.FixingsOverviewService"
-                description="Returns an overview of the fixings of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.FixingsOverviewService"
+                description="Returns an overview of the fixings of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="fixings-km-chart"
-                service="de.intevation.flys.artifacts.services.FixingsKMChartService"
-                description="Returns a chart of fixings of given river and km.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.FixingsKMChartService"
+                description="Returns a chart of fixings of given river and km.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="gaugeinfo"
-                service="de.intevation.flys.artifacts.services.GaugeInfoService"
-                description="Returns an overview of the fixings of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.GaugeInfoService"
+                description="Returns an overview of the fixings of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="fileupload"
-                service="de.intevation.flys.artifacts.services.FileUploadService"
-                description="Takes base64 coded files embedded in XML.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.FileUploadService"
+                description="Takes base64 coded files embedded in XML.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="themelisting"
-                service="de.intevation.flys.artifacts.services.ThemeListingService"
-                description="Returns a list of Themes filtered by theme name.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.ThemeListingService"
+                description="Returns a list of Themes filtered by theme name.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="sq-km-chart"
-                service="de.intevation.flys.artifacts.services.SQKMChartService"
-                description="Returns a chart of km and date of meassuring points of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.SQKMChartService"
+                description="Returns a chart of km and date of meassuring points of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="modules"
-                service="de.intevation.flys.artifacts.services.ModuleService"
-                description="Returns a list of available modules.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.ModuleService"
+                description="Returns a list of available modules.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="bed-km-chart"
-                service="de.intevation.flys.artifacts.services.BedKMChartService"
-                description="Returns a chart of km and date of meassuring points of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.BedKMChartService"
+                description="Returns a chart of km and date of meassuring points of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="bedload-km-chart"
-                service="de.intevation.flys.artifacts.services.BedloadKMChartService"
-                description="Returns a chart of km and date of meassuring points of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.BedloadKMChartService"
+                description="Returns a chart of km and date of meassuring points of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="gaugeoverviewinfo"
-                service="de.intevation.flys.artifacts.services.GaugeOverviewInfoService"
-                description="Returns an overview of the fixings of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.GaugeOverviewInfoService"
+                description="Returns an overview of the fixings of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="dischargetablesoverview"
-                service="de.intevation.flys.artifacts.services.DischargeTablesOverview"
-                description="Returns an overview of the fixings of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.DischargeTablesOverview"
+                description="Returns an overview of the fixings of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="measurementstationinfo"
-                service="de.intevation.flys.artifacts.services.MeasurementStationInfoService"
-                description="Returns an overview of the measurement stations of a given river.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.MeasurementStationInfoService"
+                description="Returns an overview of the measurement stations of a given river.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
             <service-factory
                 name="sedimentloadinfo"
-                service="de.intevation.flys.artifacts.services.SedimentLoadInfoService"
-                description="Returns sedimentloads.">de.intevation.artifactdatabase.DefaultServiceFactory</service-factory>
+                service="org.dive4elements.river.artifacts.services.SedimentLoadInfoService"
+                description="Returns sedimentloads.">org.dive4elements.artifactdatabase.DefaultServiceFactory</service-factory>
         </service-factories>
 
     </factories>
 
     <lifetime-listeners>
-        <listener>de.intevation.flys.artifacts.datacage.Datacage</listener>
-        <listener>de.intevation.flys.wsplgen.SchedulerSetup</listener>
-        <listener>de.intevation.flys.artifacts.map.RiverMapfileGeneratorStarter</listener>
+        <listener>org.dive4elements.river.artifacts.datacage.Datacage</listener>
+        <listener>org.dive4elements.river.wsplgen.SchedulerSetup</listener>
+        <listener>org.dive4elements.river.artifacts.map.RiverMapfileGeneratorStarter</listener>
     </lifetime-listeners>
 
     <backend-listeners>
-        <listener>de.intevation.flys.artifacts.datacage.DatacageBackendListener</listener>
+        <listener>org.dive4elements.river.artifacts.datacage.DatacageBackendListener</listener>
     </backend-listeners>
 
     <callcontext-listener
         name="SessionCallContextListener"
-        description="A CallContext.Listener to open and close Hibernatesessions">de.intevation.flys.artifacts.context.SessionCallContextListener</callcontext-listener>
+        description="A CallContext.Listener to open and close Hibernatesessions">org.dive4elements.river.artifacts.context.SessionCallContextListener</callcontext-listener>
 
     <artifacts>
         <artifact name="manualpoints" xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${artifacts.config.dir}/artifacts/manualpoints.xml" />
@@ -273,7 +273,7 @@
 
     <hooks>
         <hook
-            class="de.intevation.flys.artifacts.CollectionMonitor"
+            class="org.dive4elements.river.artifacts.CollectionMonitor"
             applies="post-feed,post-advance,post-describe"
             xmlns:xlink="http://www.w3.org/1999/xlink"
             xlink:href="${artifacts.config.dir}/output-defaults.xml">
@@ -281,99 +281,99 @@
     </hooks>
 
     <output-generators>
-        <output-generator name="discharge_curve">de.intevation.flys.exports.DischargeCurveGenerator</output-generator>
-        <output-generator name="discharge_curve_chartinfo">de.intevation.flys.exports.DischargeCurveInfoGenerator</output-generator>
-        <output-generator name="cross_section">de.intevation.flys.exports.CrossSectionGenerator</output-generator>
-        <output-generator name="cross_section_chartinfo">de.intevation.flys.exports.CrossSectionInfoGenerator</output-generator>
-        <output-generator name="computed_discharge_curve">de.intevation.flys.exports.ComputedDischargeCurveGenerator</output-generator>
-        <output-generator name="computed_discharge_curve_chartinfo">de.intevation.flys.exports.ComputedDischargeCurveInfoGenerator</output-generator>
-        <output-generator name="longitudinal_section">de.intevation.flys.exports.LongitudinalSectionGenerator</output-generator>
-        <output-generator name="longitudinal_section_chartinfo">de.intevation.flys.exports.LongitudinalSectionInfoGenerator</output-generator>
-        <output-generator name="duration_curve">de.intevation.flys.exports.DurationCurveGenerator</output-generator>
-        <output-generator name="duration_curve_chartinfo">de.intevation.flys.exports.DurationCurveInfoGenerator</output-generator>
-        <output-generator name="discharge_longitudinal_section">de.intevation.flys.exports.DischargeLongitudinalSectionGenerator</output-generator>
-        <output-generator name="discharge_longitudinal_section_chartinfo">de.intevation.flys.exports.DischargeLongitudinalSectionInfoGenerator</output-generator>
-        <output-generator name="waterlevel_export">de.intevation.flys.exports.WaterlevelExporter</output-generator>
-        <output-generator name="extreme_wq_curve">de.intevation.flys.exports.extreme.ExtremeWQCurveGenerator</output-generator>
-        <output-generator name="extreme_curve_export">de.intevation.flys.exports.WaterlevelExporter</output-generator>
-        <output-generator name="extreme_wq_curve_chartinfo">de.intevation.flys.exports.extreme.ExtremeWQCurveInfoGenerator</output-generator>
-        <output-generator name="fix_wq_curve">de.intevation.flys.exports.fixings.FixWQCurveGenerator</output-generator>
-        <output-generator name="fix_wq_curve_chartinfo">de.intevation.flys.exports.fixings.FixWQCurveInfoGenerator</output-generator>
-        <output-generator name="durationcurve_export">de.intevation.flys.exports.DurationCurveExporter</output-generator>
-        <output-generator name="computed_dischargecurve_export">de.intevation.flys.exports.ComputedDischargeCurveExporter</output-generator>
-        <output-generator name="discharge_longitudinal_section_export">de.intevation.flys.exports.DischargeLongitudinalSectionExporter</output-generator>
-        <output-generator name="w_differences">de.intevation.flys.exports.WDifferencesCurveGenerator</output-generator>
-        <output-generator name="w_differences_chartinfo">de.intevation.flys.exports.WDifferencesCurveInfoGenerator</output-generator>
-        <output-generator name="w_differences_export">de.intevation.flys.exports.WDifferencesExporter</output-generator>
-        <output-generator name="floodmap">de.intevation.flys.exports.MapGenerator</output-generator>
-        <output-generator name="map">de.intevation.flys.exports.MapGenerator</output-generator>
-        <output-generator name="reference_curve">de.intevation.flys.exports.ReferenceCurveGenerator</output-generator>
-        <output-generator name="reference_curve_normalized">de.intevation.flys.exports.NormalizedReferenceCurveGenerator</output-generator>
-        <output-generator name="reference_curve_normalized_chartinfo">de.intevation.flys.exports.NormalizedReferenceCurveInfoGenerator</output-generator>
-        <output-generator name="reference_curve_chartinfo">de.intevation.flys.exports.ReferenceCurveInfoGenerator</output-generator>
-        <output-generator name="reference_curve_export">de.intevation.flys.exports.ReferenceCurveExporter</output-generator>
-        <output-generator name="historical_discharge">de.intevation.flys.exports.HistoricalDischargeCurveGenerator</output-generator>
-        <output-generator name="historical_discharge_chartinfo">de.intevation.flys.exports.HistoricalDischargeCurveInfoGenerator</output-generator>
-        <output-generator name="historical_discharge_wq">de.intevation.flys.exports.HistoricalDischargeWQCurveGenerator</output-generator>
-        <output-generator name="historical_discharge_wq_chartinfo">de.intevation.flys.exports.HistoricalDischargeWQCurveInfoGenerator</output-generator>
-        <output-generator name="historical_discharge_export">de.intevation.flys.exports.HistoricalDischargeCurveExporter</output-generator>
-        <output-generator name="flow_velocity">de.intevation.flys.exports.FlowVelocityGenerator</output-generator>
-        <output-generator name="flow_velocity_chartinfo">de.intevation.flys.exports.FlowVelocityInfoGenerator</output-generator>
-        <output-generator name="flow_velocity_export">de.intevation.flys.exports.FlowVelocityExporter</output-generator>
-        <output-generator name="bedheight_middle">de.intevation.flys.exports.MiddleBedHeightGenerator</output-generator>
-        <output-generator name="bedheight_middle_chartinfo">de.intevation.flys.exports.MiddleBedHeightInfoGenerator</output-generator>
-        <output-generator name="bedheight_middle_export">de.intevation.flys.exports.MiddleBedHeightExporter</output-generator>
-        <output-generator name="bed_longitudinal_section">de.intevation.flys.exports.minfo.BedQualityGenerator</output-generator>
-        <output-generator name="bed_longitudinal_section_chartinfo">de.intevation.flys.exports.minfo.BedQualityInfoGenerator</output-generator>
-        <output-generator name="bed_quality_export">de.intevation.flys.exports.minfo.BedQualityExporter</output-generator>
-        <output-generator name="bed_difference_year">de.intevation.flys.exports.minfo.BedDifferenceYearGenerator</output-generator>
-        <output-generator name="bed_difference_year_chartinfo">de.intevation.flys.exports.minfo.BedDiffYearInfoGenerator</output-generator>
-        <output-generator name="bed_difference_epoch">de.intevation.flys.exports.minfo.BedDifferenceEpochGenerator</output-generator>
-        <output-generator name="bed_difference_epoch_chartinfo">de.intevation.flys.exports.minfo.BedDiffEpochInfoGenerator</output-generator>
-        <output-generator name="bed_difference_height_year">de.intevation.flys.exports.minfo.BedDiffHeightYearGenerator</output-generator>
-        <output-generator name="bed_difference_height_year_chartinfo">de.intevation.flys.exports.minfo.BedDiffHeightYearInfoGenerator</output-generator>
-        <output-generator name="sq_relation_a">de.intevation.flys.exports.sq.SQRelationGeneratorA</output-generator>
-        <output-generator name="sq_relation_b">de.intevation.flys.exports.sq.SQRelationGeneratorB</output-generator>
-        <output-generator name="sq_relation_c">de.intevation.flys.exports.sq.SQRelationGeneratorC</output-generator>
-        <output-generator name="sq_relation_d">de.intevation.flys.exports.sq.SQRelationGeneratorD</output-generator>
-        <output-generator name="sq_relation_e">de.intevation.flys.exports.sq.SQRelationGeneratorE</output-generator>
-        <output-generator name="sq_relation_f">de.intevation.flys.exports.sq.SQRelationGeneratorF</output-generator>
-        <output-generator name="sq_relation_a_chartinfo">de.intevation.flys.exports.sq.SQRelationInfoGenerator</output-generator>
-        <output-generator name="sq_relation_b_chartinfo">de.intevation.flys.exports.sq.SQRelationInfoGenerator</output-generator>
-        <output-generator name="sq_relation_c_chartinfo">de.intevation.flys.exports.sq.SQRelationInfoGenerator</output-generator>
-        <output-generator name="sq_relation_d_chartinfo">de.intevation.flys.exports.sq.SQRelationInfoGenerator</output-generator>
-        <output-generator name="sq_relation_e_chartinfo">de.intevation.flys.exports.sq.SQRelationInfoGenerator</output-generator>
-        <output-generator name="sq_relation_f_chartinfo">de.intevation.flys.exports.sq.SQRelationInfoGenerator</output-generator>
-        <output-generator name="sq_relation_export">de.intevation.flys.exports.sq.SQRelationExporter</output-generator>
-        <output-generator name="sq_overview">de.intevation.flys.exports.sq.SQOverviewGenerator</output-generator>
-        <output-generator name="fix_parameters_export">de.intevation.flys.exports.fixings.ParametersExporter</output-generator>
-        <output-generator name="fix_deltawt_export">de.intevation.flys.exports.fixings.DeltaWtExporter</output-generator>
-        <output-generator name="fix_deltawt_curve">de.intevation.flys.exports.fixings.FixDeltaWtGenerator</output-generator>
-        <output-generator name="fix_deltawt_curve_chartinfo">de.intevation.flys.exports.fixings.FixDeltaWtInfoGenerator</output-generator>
-        <output-generator name="fix_longitudinal_section_curve">de.intevation.flys.exports.fixings.FixLongitudinalSectionGenerator</output-generator>
-        <output-generator name="fix_longitudinal_section_curve_chartinfo">de.intevation.flys.exports.fixings.FixLongitudinalSectionInfoGenerator</output-generator>
-        <output-generator name="fix_derivate_curve">de.intevation.flys.exports.fixings.FixDerivedCurveGenerator</output-generator>
-        <output-generator name="fix_derivate_curve_chartinfo">de.intevation.flys.exports.fixings.FixDerivedCurveInfoGenerator</output-generator>
-        <output-generator name="fix_waterlevel_export">de.intevation.flys.exports.WaterlevelExporter</output-generator>
-        <output-generator name="fix_vollmer_wq_curve">de.intevation.flys.exports.fixings.FixWQCurveGenerator</output-generator>
-        <output-generator name="fix_vollmer_wq_curve_chartinfo">de.intevation.flys.exports.fixings.FixWQCurveInfoGenerator</output-generator>
-        <output-generator name="sedimentload_ls">de.intevation.flys.exports.minfo.SedimentLoadLSGenerator</output-generator>
-        <output-generator name="sedimentload_ls_chartinfo">de.intevation.flys.exports.minfo.SedimentLoadLSInfoGenerator</output-generator>
+        <output-generator name="discharge_curve">org.dive4elements.river.exports.DischargeCurveGenerator</output-generator>
+        <output-generator name="discharge_curve_chartinfo">org.dive4elements.river.exports.DischargeCurveInfoGenerator</output-generator>
+        <output-generator name="cross_section">org.dive4elements.river.exports.CrossSectionGenerator</output-generator>
+        <output-generator name="cross_section_chartinfo">org.dive4elements.river.exports.CrossSectionInfoGenerator</output-generator>
+        <output-generator name="computed_discharge_curve">org.dive4elements.river.exports.ComputedDischargeCurveGenerator</output-generator>
+        <output-generator name="computed_discharge_curve_chartinfo">org.dive4elements.river.exports.ComputedDischargeCurveInfoGenerator</output-generator>
+        <output-generator name="longitudinal_section">org.dive4elements.river.exports.LongitudinalSectionGenerator</output-generator>
+        <output-generator name="longitudinal_section_chartinfo">org.dive4elements.river.exports.LongitudinalSectionInfoGenerator</output-generator>
+        <output-generator name="duration_curve">org.dive4elements.river.exports.DurationCurveGenerator</output-generator>
+        <output-generator name="duration_curve_chartinfo">org.dive4elements.river.exports.DurationCurveInfoGenerator</output-generator>
+        <output-generator name="discharge_longitudinal_section">org.dive4elements.river.exports.DischargeLongitudinalSectionGenerator</output-generator>
+        <output-generator name="discharge_longitudinal_section_chartinfo">org.dive4elements.river.exports.DischargeLongitudinalSectionInfoGenerator</output-generator>
+        <output-generator name="waterlevel_export">org.dive4elements.river.exports.WaterlevelExporter</output-generator>
+        <output-generator name="extreme_wq_curve">org.dive4elements.river.exports.extreme.ExtremeWQCurveGenerator</output-generator>
+        <output-generator name="extreme_curve_export">org.dive4elements.river.exports.WaterlevelExporter</output-generator>
+        <output-generator name="extreme_wq_curve_chartinfo">org.dive4elements.river.exports.extreme.ExtremeWQCurveInfoGenerator</output-generator>
+        <output-generator name="fix_wq_curve">org.dive4elements.river.exports.fixings.FixWQCurveGenerator</output-generator>
+        <output-generator name="fix_wq_curve_chartinfo">org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator</output-generator>
+        <output-generator name="durationcurve_export">org.dive4elements.river.exports.DurationCurveExporter</output-generator>
+        <output-generator name="computed_dischargecurve_export">org.dive4elements.river.exports.ComputedDischargeCurveExporter</output-generator>
+        <output-generator name="discharge_longitudinal_section_export">org.dive4elements.river.exports.DischargeLongitudinalSectionExporter</output-generator>
+        <output-generator name="w_differences">org.dive4elements.river.exports.WDifferencesCurveGenerator</output-generator>
+        <output-generator name="w_differences_chartinfo">org.dive4elements.river.exports.WDifferencesCurveInfoGenerator</output-generator>
+        <output-generator name="w_differences_export">org.dive4elements.river.exports.WDifferencesExporter</output-generator>
+        <output-generator name="floodmap">org.dive4elements.river.exports.MapGenerator</output-generator>
+        <output-generator name="map">org.dive4elements.river.exports.MapGenerator</output-generator>
+        <output-generator name="reference_curve">org.dive4elements.river.exports.ReferenceCurveGenerator</output-generator>
+        <output-generator name="reference_curve_normalized">org.dive4elements.river.exports.NormalizedReferenceCurveGenerator</output-generator>
+        <output-generator name="reference_curve_normalized_chartinfo">org.dive4elements.river.exports.NormalizedReferenceCurveInfoGenerator</output-generator>
+        <output-generator name="reference_curve_chartinfo">org.dive4elements.river.exports.ReferenceCurveInfoGenerator</output-generator>
+        <output-generator name="reference_curve_export">org.dive4elements.river.exports.ReferenceCurveExporter</output-generator>
+        <output-generator name="historical_discharge">org.dive4elements.river.exports.HistoricalDischargeCurveGenerator</output-generator>
+        <output-generator name="historical_discharge_chartinfo">org.dive4elements.river.exports.HistoricalDischargeCurveInfoGenerator</output-generator>
+        <output-generator name="historical_discharge_wq">org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator</output-generator>
+        <output-generator name="historical_discharge_wq_chartinfo">org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator</output-generator>
+        <output-generator name="historical_discharge_export">org.dive4elements.river.exports.HistoricalDischargeCurveExporter</output-generator>
+        <output-generator name="flow_velocity">org.dive4elements.river.exports.FlowVelocityGenerator</output-generator>
+        <output-generator name="flow_velocity_chartinfo">org.dive4elements.river.exports.FlowVelocityInfoGenerator</output-generator>
+        <output-generator name="flow_velocity_export">org.dive4elements.river.exports.FlowVelocityExporter</output-generator>
+        <output-generator name="bedheight_middle">org.dive4elements.river.exports.MiddleBedHeightGenerator</output-generator>
+        <output-generator name="bedheight_middle_chartinfo">org.dive4elements.river.exports.MiddleBedHeightInfoGenerator</output-generator>
+        <output-generator name="bedheight_middle_export">org.dive4elements.river.exports.MiddleBedHeightExporter</output-generator>
+        <output-generator name="bed_longitudinal_section">org.dive4elements.river.exports.minfo.BedQualityGenerator</output-generator>
+        <output-generator name="bed_longitudinal_section_chartinfo">org.dive4elements.river.exports.minfo.BedQualityInfoGenerator</output-generator>
+        <output-generator name="bed_quality_export">org.dive4elements.river.exports.minfo.BedQualityExporter</output-generator>
+        <output-generator name="bed_difference_year">org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator</output-generator>
+        <output-generator name="bed_difference_year_chartinfo">org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator</output-generator>
+        <output-generator name="bed_difference_epoch">org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator</output-generator>
+        <output-generator name="bed_difference_epoch_chartinfo">org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator</output-generator>
+        <output-generator name="bed_difference_height_year">org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator</output-generator>
+        <output-generator name="bed_difference_height_year_chartinfo">org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator</output-generator>
+        <output-generator name="sq_relation_a">org.dive4elements.river.exports.sq.SQRelationGeneratorA</output-generator>
+        <output-generator name="sq_relation_b">org.dive4elements.river.exports.sq.SQRelationGeneratorB</output-generator>
+        <output-generator name="sq_relation_c">org.dive4elements.river.exports.sq.SQRelationGeneratorC</output-generator>
+        <output-generator name="sq_relation_d">org.dive4elements.river.exports.sq.SQRelationGeneratorD</output-generator>
+        <output-generator name="sq_relation_e">org.dive4elements.river.exports.sq.SQRelationGeneratorE</output-generator>
+        <output-generator name="sq_relation_f">org.dive4elements.river.exports.sq.SQRelationGeneratorF</output-generator>
+        <output-generator name="sq_relation_a_chartinfo">org.dive4elements.river.exports.sq.SQRelationInfoGenerator</output-generator>
+        <output-generator name="sq_relation_b_chartinfo">org.dive4elements.river.exports.sq.SQRelationInfoGenerator</output-generator>
+        <output-generator name="sq_relation_c_chartinfo">org.dive4elements.river.exports.sq.SQRelationInfoGenerator</output-generator>
+        <output-generator name="sq_relation_d_chartinfo">org.dive4elements.river.exports.sq.SQRelationInfoGenerator</output-generator>
+        <output-generator name="sq_relation_e_chartinfo">org.dive4elements.river.exports.sq.SQRelationInfoGenerator</output-generator>
+        <output-generator name="sq_relation_f_chartinfo">org.dive4elements.river.exports.sq.SQRelationInfoGenerator</output-generator>
+        <output-generator name="sq_relation_export">org.dive4elements.river.exports.sq.SQRelationExporter</output-generator>
+        <output-generator name="sq_overview">org.dive4elements.river.exports.sq.SQOverviewGenerator</output-generator>
+        <output-generator name="fix_parameters_export">org.dive4elements.river.exports.fixings.ParametersExporter</output-generator>
+        <output-generator name="fix_deltawt_export">org.dive4elements.river.exports.fixings.DeltaWtExporter</output-generator>
+        <output-generator name="fix_deltawt_curve">org.dive4elements.river.exports.fixings.FixDeltaWtGenerator</output-generator>
+        <output-generator name="fix_deltawt_curve_chartinfo">org.dive4elements.river.exports.fixings.FixDeltaWtInfoGenerator</output-generator>
+        <output-generator name="fix_longitudinal_section_curve">org.dive4elements.river.exports.fixings.FixLongitudinalSectionGenerator</output-generator>
+        <output-generator name="fix_longitudinal_section_curve_chartinfo">org.dive4elements.river.exports.fixings.FixLongitudinalSectionInfoGenerator</output-generator>
+        <output-generator name="fix_derivate_curve">org.dive4elements.river.exports.fixings.FixDerivedCurveGenerator</output-generator>
+        <output-generator name="fix_derivate_curve_chartinfo">org.dive4elements.river.exports.fixings.FixDerivedCurveInfoGenerator</output-generator>
+        <output-generator name="fix_waterlevel_export">org.dive4elements.river.exports.WaterlevelExporter</output-generator>
+        <output-generator name="fix_vollmer_wq_curve">org.dive4elements.river.exports.fixings.FixWQCurveGenerator</output-generator>
+        <output-generator name="fix_vollmer_wq_curve_chartinfo">org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator</output-generator>
+        <output-generator name="sedimentload_ls">org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator</output-generator>
+        <output-generator name="sedimentload_ls_chartinfo">org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator</output-generator>
         <!-- Error report generators. -->
-        <output-generator name="discharge_longitudinal_section_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="waterlevel_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="computed_dischargecurve_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="durationcurve_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="wsplgen_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="historical_discharge_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="reference_curve_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="fix_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="extreme_curve_report">de.intevation.flys.exports.ReportGenerator</output-generator>
-        <output-generator name="sedimentload_ls_report">de.intevation.flys.exports.ReportGenerator</output-generator>
+        <output-generator name="discharge_longitudinal_section_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="waterlevel_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="computed_dischargecurve_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="durationcurve_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="wsplgen_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="historical_discharge_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="reference_curve_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="fix_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="extreme_curve_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
+        <output-generator name="sedimentload_ls_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
         <!-- AT exporter. -->
-        <output-generator name="computed_dischargecurve_at_export">de.intevation.flys.exports.ATExporter</output-generator>
-        <output-generator name="gauge_discharge_curve_at_export">de.intevation.flys.exports.ATExporter</output-generator>
-        <output-generator name="fix_wq_curve_at_export">de.intevation.flys.exports.fixings.FixATExport</output-generator>
+        <output-generator name="computed_dischargecurve_at_export">org.dive4elements.river.exports.ATExporter</output-generator>
+        <output-generator name="gauge_discharge_curve_at_export">org.dive4elements.river.exports.ATExporter</output-generator>
+        <output-generator name="fix_wq_curve_at_export">org.dive4elements.river.exports.fixings.FixATExport</output-generator>
     </output-generators>
 
     <!-- Path to the template file of the meta data. -->