--- 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>