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