--- a/flys-backend/pom.xml	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-backend/pom.xml	Thu Apr 25 13:12:15 2013 +0200
@@ -67,7 +67,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.dive4elements.common</groupId>
+      <groupId>org.dive4elements</groupId>
       <artifactId>artifacts-common</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>    

--- a/flys-client/pom.xml	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/pom.xml	Thu Apr 25 13:12:15 2013 +0200
@@ -4,11 +4,11 @@
 
   <!-- POM file generated with GWT webAppCreator -->
   <modelVersion>4.0.0</modelVersion>
-  <groupId>de.intevation.flys.client</groupId>
-  <artifactId>FLYS</artifactId>
+  <groupId>org.dive4elements.river.client</groupId>
+  <artifactId>client</artifactId>
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>de.intevation.flys.client.FLYS</name>
+  <name>org.dive4elements.river.client</name>
   
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -43,12 +43,12 @@
       <version>3.0</version>
     </dependency>
     <dependency>
-      <groupId>de.intevation.artifacts.common</groupId>
+      <groupId>org.dive4elements</groupId>
       <artifactId>artifacts-common</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-        <groupId>de.intevation.artifacts.httpclient</groupId>
+        <groupId>org.dive4elements</groupId>
         <artifactId>http-client</artifactId>
         <version>1.0-SNAPSHOT</version>
     </dependency>
@@ -234,5 +234,3 @@
       </repository>
     </repositories>
 </project>
-
-

--- a/flys-client/src/main/java/org/dive4elements/river/client/FLYS.gwt.xml	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/FLYS.gwt.xml	Thu Apr 25 13:12:15 2013 +0200
@@ -12,7 +12,7 @@
   <!-- Inherit the Resource module of GWT                         -->
   <inherits name="com.google.gwt.resources.Resources"/>
 
-  <inherits name="de.intevation.artifacts.common.Common"/>
+  <inherits name="org.dive4elements.artifacts.common.Common"/>
 
   <!-- Inherit the smartgwt Enterprise Theme.                -->
   <inherits name="com.smartgwt.SmartGwtNoTheme" />
@@ -34,7 +34,7 @@
   <!-- Other module inherits                                      -->
 
   <!-- Specify the app entry point class.                         -->
-  <entry-point class='de.intevation.flys.client.client.FLYS'/>
+  <entry-point class='org.dive4elements.river.client.client.FLYS'/>
 
   <!-- Specify the paths for translatable code                    -->
   <source path='client'/>

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/Config.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/Config.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client;
+package org.dive4elements.river.client.client;
 
 import com.google.gwt.i18n.client.LocaleInfo;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/FLYS.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/FLYS.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client;
+package org.dive4elements.river.client.client;
 
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
@@ -13,33 +13,33 @@
 import com.smartgwt.client.widgets.events.CloseClickHandler;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.event.CollectionChangeEvent;
-import de.intevation.flys.client.client.event.CollectionChangeHandler;
-import de.intevation.flys.client.client.services.ArtifactService;
-import de.intevation.flys.client.client.services.ArtifactServiceAsync;
-import de.intevation.flys.client.client.services.CreateCollectionService;
-import de.intevation.flys.client.client.services.CreateCollectionServiceAsync;
-import de.intevation.flys.client.client.services.DescribeCollectionService;
-import de.intevation.flys.client.client.services.DescribeCollectionServiceAsync;
-import de.intevation.flys.client.client.services.GetArtifactService;
-import de.intevation.flys.client.client.services.GetArtifactServiceAsync;
-import de.intevation.flys.client.client.services.RiverService;
-import de.intevation.flys.client.client.services.RiverServiceAsync;
-import de.intevation.flys.client.client.services.UserService;
-import de.intevation.flys.client.client.services.UserServiceAsync;
-import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.ui.FLYSHeader;
-import de.intevation.flys.client.client.ui.FLYSView;
-import de.intevation.flys.client.client.ui.FLYSWorkspace;
-import de.intevation.flys.client.client.ui.ProjectList;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItem;
-import de.intevation.flys.client.shared.model.GaugeInfo;
-import de.intevation.flys.client.shared.model.River;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.event.CollectionChangeEvent;
+import org.dive4elements.river.client.client.event.CollectionChangeHandler;
+import org.dive4elements.river.client.client.services.ArtifactService;
+import org.dive4elements.river.client.client.services.ArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.CreateCollectionService;
+import org.dive4elements.river.client.client.services.CreateCollectionServiceAsync;
+import org.dive4elements.river.client.client.services.DescribeCollectionService;
+import org.dive4elements.river.client.client.services.DescribeCollectionServiceAsync;
+import org.dive4elements.river.client.client.services.GetArtifactService;
+import org.dive4elements.river.client.client.services.GetArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.RiverService;
+import org.dive4elements.river.client.client.services.RiverServiceAsync;
+import org.dive4elements.river.client.client.services.UserService;
+import org.dive4elements.river.client.client.services.UserServiceAsync;
+import org.dive4elements.river.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.ui.FLYSHeader;
+import org.dive4elements.river.client.client.ui.FLYSView;
+import org.dive4elements.river.client.client.ui.FLYSWorkspace;
+import org.dive4elements.river.client.client.ui.ProjectList;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItem;
+import org.dive4elements.river.client.shared.model.GaugeInfo;
+import org.dive4elements.river.client.shared.model.River;
+import org.dive4elements.river.client.shared.model.User;
 
-import de.intevation.flys.client.client.ui.wq.WQAutoTabSet;
+import org.dive4elements.river.client.client.ui.wq.WQAutoTabSet;
 
 import java.util.ArrayList;
 import java.util.List;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client;
+package org.dive4elements.river.client.client;
 
 import com.google.gwt.i18n.client.ConstantsWithLookup;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/FLYSImages.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/FLYSImages.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client;
+package org.dive4elements.river.client.client;
 
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.ImageResource;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/FLYSResources.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/FLYSResources.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client;
+package org.dive4elements.river.client.client;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/AdvanceHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/AdvanceHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 import java.io.Serializable;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/CollectionChangeEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/CollectionChangeEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,6 +1,6 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/CollectionChangeHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/CollectionChangeHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/DatacageDoubleClickHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/DatacageDoubleClickHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,6 +1,6 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
-import de.intevation.flys.client.shared.model.ToLoad;
+import org.dive4elements.river.client.shared.model.ToLoad;
 
 
 public interface DatacageDoubleClickHandler {

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/DatacageHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/DatacageHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,6 +1,6 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
-import de.intevation.flys.client.shared.model.ToLoad;
+import org.dive4elements.river.client.shared.model.ToLoad;
 
 public interface DatacageHandler
 {

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/FilterHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/FilterHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasCollectionChangeHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasCollectionChangeHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasOutputModesChangeHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasOutputModesChangeHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasOutputParameterChangeHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasOutputParameterChangeHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasPanHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasPanHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasParameterChangeHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasParameterChangeHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasRedrawRequestHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasRedrawRequestHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasStepBackHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasStepBackHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 import java.io.Serializable;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasStepForwardHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasStepForwardHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 import java.io.Serializable;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasZoomHandlers.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/HasZoomHandlers.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/OnMoveEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/OnMoveEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/OnMoveHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/OnMoveHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputModesChangeEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputModesChangeEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,6 +1,6 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
-import de.intevation.flys.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.OutputMode;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputModesChangeHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputModesChangeHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputParameterChangeEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputParameterChangeEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputParameterChangeHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputParameterChangeHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/PanEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/PanEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/PanHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/PanHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/ParameterChangeEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/ParameterChangeEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,6 +1,6 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/ParameterChangeHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/ParameterChangeHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/RangeFilterEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/RangeFilterEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 import com.google.gwt.i18n.client.NumberFormat;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/RedrawRequestEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/RedrawRequestEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 public class RedrawRequestEvent {

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/RedrawRequestHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/RedrawRequestHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepBackEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepBackEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 import java.io.Serializable;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepBackHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepBackHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 import java.io.Serializable;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepForwardEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepForwardEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,6 +1,6 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
-import de.intevation.flys.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.Data;
 
 import java.io.Serializable;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepForwardHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/StepForwardHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 import java.io.Serializable;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/StringFilterEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/StringFilterEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/ZoomEvent.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/ZoomEvent.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/event/ZoomHandler.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/event/ZoomHandler.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.event;
+package org.dive4elements.river.client.client.event;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/AddArtifactService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/AddArtifactService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/AddArtifactServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/AddArtifactServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,9 +1,9 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/AdvanceService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/AdvanceService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 /**
  * This interface provides artifact specific operation ADVANCE.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/AdvanceServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/AdvanceServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ArtifactService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ArtifactService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,13 +1,13 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
 
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Recommendation;
 
 /**
  * This interface provides artifact specific services as CREATE, DESCRIBE, FEED,

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ArtifactServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ArtifactServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
 
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Recommendation;
 
 /**
  * This interface provides artifact specific services as CREATE, DESCRIBE, FEED,

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CSVExportService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CSVExportService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
 import java.util.List;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
 
 /**
  * This service is used to fetch a list of DistanceInfoObjects from artifact

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CSVExportServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CSVExportServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ChartInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ChartInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,13 +1,13 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.ChartInfo;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.ChartInfo;
+import org.dive4elements.river.client.shared.model.Collection;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ChartInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ChartInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.ChartInfo;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.ChartInfo;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionAttributeService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionAttributeService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionAttributeServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionAttributeServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionItemAttributeService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionItemAttributeService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItemAttribute;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItemAttribute;
 
 /**
  * This interface provides a method to retrieve an artifact based on its uuid.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionItemAttributeServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionItemAttributeServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,9 +1,9 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItemAttribute;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItemAttribute;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CreateCollectionService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CreateCollectionService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CreateCollectionServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CreateCollectionServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CrossSectionKMService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CrossSectionKMService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
 
 /**
  * This interface provides access to CrossSectionKMService .

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/CrossSectionKMServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/CrossSectionKMServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DeleteCollectionService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DeleteCollectionService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DeleteCollectionServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DeleteCollectionServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeArtifactService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeArtifactService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 /**
  * This interface provides artifact specific operation DESCRIBE.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeArtifactServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeArtifactServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeCollectionService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeCollectionService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeCollectionServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeCollectionServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DischargeInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DischargeInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.DischargeInfoObject;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.DischargeInfoObject;
 
 /**
  * This service is used to fetch a list of DischargeInfoObjects from artifact

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DischargeInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DischargeInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.DischargeInfoObject;
+import org.dive4elements.river.client.shared.model.DischargeInfoObject;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DistanceInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DistanceInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.DistanceInfoObject;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.DistanceInfoObject;
 
 /**
  * This service is used to fetch a list of DistanceInfoObjects from artifact

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/DistanceInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/DistanceInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.DistanceInfoObject;
+import org.dive4elements.river.client.shared.model.DistanceInfoObject;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/FeedService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/FeedService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,13 +1,13 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.List;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Data;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Data;
 
 /**
  * This interface provides artifact specific operation FEED.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/FeedServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/FeedServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.List;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Data;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/FixingsOverviewService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/FixingsOverviewService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
 
-import de.intevation.flys.client.shared.model.FixingsOverviewInfo;
+import org.dive4elements.river.client.shared.model.FixingsOverviewInfo;
 
 @RemoteServiceRelativePath("fixings-overview")
 public interface FixingsOverviewService extends RemoteService {

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/FixingsOverviewServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/FixingsOverviewServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.FixingsOverviewInfo;
+import org.dive4elements.river.client.shared.model.FixingsOverviewInfo;
 
 public interface FixingsOverviewServiceAsync {
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GCService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GCService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Capabilities;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Capabilities;
 
 
 @RemoteServiceRelativePath("getcapabilities")

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GCServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GCServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Capabilities;
+import org.dive4elements.river.client.shared.model.Capabilities;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GFIService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GFIService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.List;
 
@@ -6,9 +6,9 @@
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.FeatureInfoResponse;
-import de.intevation.flys.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.FeatureInfoResponse;
+import org.dive4elements.river.client.shared.model.Theme;
 
 
 @RemoteServiceRelativePath("getfeatureinfo")

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GFIServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GFIServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.List;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.FeatureInfoResponse;
-import de.intevation.flys.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.FeatureInfoResponse;
+import org.dive4elements.river.client.shared.model.Theme;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GaugeInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GaugeInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,12 +1,12 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.List;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Gauge;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Gauge;
 
 /**
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GaugeInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GaugeInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.List;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Gauge;
+import org.dive4elements.river.client.shared.model.Gauge;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GetArtifactService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GetArtifactService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 /**
  * This interface provides a method to retrieve an artifact based on its uuid.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/GetArtifactServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/GetArtifactServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/LoadArtifactService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/LoadArtifactService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,12 +1,12 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Recommendation;
 
 /** @see LoadArtifactServiceImpl */
 @RemoteServiceRelativePath("load-artifact")

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/LoadArtifactServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/LoadArtifactServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Recommendation;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.MapInfo;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.MapInfo;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.MapInfo;
+import org.dive4elements.river.client.shared.model.MapInfo;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapOutputService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapOutputService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.MapConfig;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.MapConfig;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapOutputServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapOutputServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,9 +1,9 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.MapConfig;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.MapConfig;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapUrlService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapUrlService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
 
 /**
  * This interface describes the service to get wms urls for UESK and new maps.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapUrlServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MapUrlServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MetaDataService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MetaDataService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
 
-import de.intevation.flys.client.shared.model.DataCageTree;
+import org.dive4elements.river.client.shared.model.DataCageTree;
 
 @RemoteServiceRelativePath("meta-data")
 public interface MetaDataService extends RemoteService

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/MetaDataServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/MetaDataServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.DataCageTree;
+import org.dive4elements.river.client.shared.model.DataCageTree;
 
 public interface MetaDataServiceAsync {
     void getMetaData(

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ModuleService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ModuleService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Module;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Module;
 
 @RemoteServiceRelativePath("modules")
 public interface ModuleService extends RemoteService {

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ModuleServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ModuleServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Module;
+import org.dive4elements.river.client.shared.model.Module;
 
 public interface ModuleServiceAsync {
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/RemoveArtifactService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/RemoveArtifactService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/RemoveArtifactServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/RemoveArtifactServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 /**
  * @see RemoveArtifactService, RemoveArtifactServiceImpl

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ReportService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ReportService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ReportServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ReportServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.RiverInfo;
 
 /**
  * @author <a href="mailto:bjoern.ricks@intevation.de">Björn Ricks</a>

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.shared.model.RiverInfo;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.River;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.River;
 
 /**
  * This interface provides a method to list the supported rivers of the artifact

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.River;
+import org.dive4elements.river.client.shared.model.River;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/SedimentLoadInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/SedimentLoadInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.SedimentLoadInfoObject;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.SedimentLoadInfoObject;
 
 /**
  * This service is used to fetch a list of SedimentLoadInfoObjects from artifact

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/SedimentLoadInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/SedimentLoadInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.SedimentLoadInfoObject;
+import org.dive4elements.river.client.shared.model.SedimentLoadInfoObject;
 
 /**
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionNameService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionNameService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionNameServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionNameServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionTTLService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionTTLService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionTTLServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionTTLServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/StepForwardService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/StepForwardService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Data;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Data;
 
 /**
  * This interface provides artifact specific operations FEED and ADVANCE.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/StepForwardServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/StepForwardServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,9 +1,9 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Data;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ThemeListingService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ThemeListingService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,12 +1,12 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Style;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Style;
 
 /**
  * This interface provides a method to list themes filtered by name.

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/ThemeListingServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/ThemeListingServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import java.util.Map;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Style;
+import org.dive4elements.river.client.shared.model.Style;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,9 +1,9 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Collection;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.AuthenticationException;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.shared.exceptions.AuthenticationException;
+import org.dive4elements.river.client.shared.model.User;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/UserServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.shared.model.User;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/WQInfoService.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/WQInfoService.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.WQInfoObject;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.WQInfoObject;
 
 /**
  * This service is used to fetch a list of DistanceInfoObjects from artifact

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/services/WQInfoServiceAsync.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/services/WQInfoServiceAsync.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.services;
+package org.dive4elements.river.client.client.services;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.shared.model.WQInfoObject;
+import org.dive4elements.river.client.shared.model.WQInfoObject;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/AbstractUIProvider.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/AbstractUIProvider.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
@@ -10,21 +10,21 @@
 import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.HasStepBackHandlers;
-import de.intevation.flys.client.client.event.HasStepForwardHandlers;
-import de.intevation.flys.client.client.event.StepBackEvent;
-import de.intevation.flys.client.client.event.StepBackHandler;
-import de.intevation.flys.client.client.event.StepForwardEvent;
-import de.intevation.flys.client.client.event.StepForwardHandler;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataItem;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.HasStepBackHandlers;
+import org.dive4elements.river.client.client.event.HasStepForwardHandlers;
+import org.dive4elements.river.client.client.event.StepBackEvent;
+import org.dive4elements.river.client.client.event.StepBackHandler;
+import org.dive4elements.river.client.client.event.StepForwardEvent;
+import org.dive4elements.river.client.client.event.StepForwardHandler;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataItem;
+import org.dive4elements.river.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.DefaultDataItem;
 
 import java.util.ArrayList;
 import java.util.List;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/AutoIntegerPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/AutoIntegerPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
@@ -8,9 +8,9 @@
 import com.smartgwt.client.widgets.form.validator.Validator;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/BooleanPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/BooleanPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,13 +1,13 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.smartgwt.client.types.FieldType;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataItem;
-import de.intevation.flys.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataItem;
+import org.dive4elements.river.client.shared.model.DataList;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/CollectionView.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/CollectionView.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
@@ -18,42 +18,42 @@
 
 import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSConstants;
-
-import de.intevation.flys.client.client.event.CollectionChangeEvent;
-import de.intevation.flys.client.client.event.CollectionChangeHandler;
-import de.intevation.flys.client.client.event.HasCollectionChangeHandlers;
-import de.intevation.flys.client.client.event.HasOutputModesChangeHandlers;
-import de.intevation.flys.client.client.event.OutputModesChangeEvent;
-import de.intevation.flys.client.client.event.OutputModesChangeHandler;
-import de.intevation.flys.client.client.event.ParameterChangeEvent;
-import de.intevation.flys.client.client.event.ParameterChangeHandler;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
 
-import de.intevation.flys.client.client.services.AddArtifactService;
-import de.intevation.flys.client.client.services.AddArtifactServiceAsync;
-import de.intevation.flys.client.client.services.ArtifactService;
-import de.intevation.flys.client.client.services.ArtifactServiceAsync;
-import de.intevation.flys.client.client.services.CollectionAttributeService;
-import de.intevation.flys.client.client.services.CollectionAttributeServiceAsync;
-import de.intevation.flys.client.client.services.CreateCollectionService;
-import de.intevation.flys.client.client.services.CreateCollectionServiceAsync;
-import de.intevation.flys.client.client.services.DescribeCollectionService;
-import de.intevation.flys.client.client.services.DescribeCollectionServiceAsync;
-import de.intevation.flys.client.client.services.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.event.CollectionChangeEvent;
+import org.dive4elements.river.client.client.event.CollectionChangeHandler;
+import org.dive4elements.river.client.client.event.HasCollectionChangeHandlers;
+import org.dive4elements.river.client.client.event.HasOutputModesChangeHandlers;
+import org.dive4elements.river.client.client.event.OutputModesChangeEvent;
+import org.dive4elements.river.client.client.event.OutputModesChangeHandler;
+import org.dive4elements.river.client.client.event.ParameterChangeEvent;
+import org.dive4elements.river.client.client.event.ParameterChangeHandler;
 
-import de.intevation.flys.client.client.ui.ScreenLock;
+import org.dive4elements.river.client.client.services.AddArtifactService;
+import org.dive4elements.river.client.client.services.AddArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.ArtifactService;
+import org.dive4elements.river.client.client.services.ArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.CollectionAttributeService;
+import org.dive4elements.river.client.client.services.CollectionAttributeServiceAsync;
+import org.dive4elements.river.client.client.services.CreateCollectionService;
+import org.dive4elements.river.client.client.services.CreateCollectionServiceAsync;
+import org.dive4elements.river.client.client.services.DescribeCollectionService;
+import org.dive4elements.river.client.client.services.DescribeCollectionServiceAsync;
+import org.dive4elements.river.client.client.services.LoadArtifactService;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.ExportMode;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.ReportMode;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.ui.ScreenLock;
+
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.ExportMode;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.ReportMode;
+import org.dive4elements.river.client.shared.model.User;
 
 import java.util.ArrayList;
 import java.util.HashMap;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ContinuePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ContinuePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
@@ -8,11 +8,11 @@
 import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
 import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.AdvanceHandler;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.AdvanceHandler;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
 
 import java.util.ArrayList;
 import java.util.List;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageButton.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageButton.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.smartgwt.client.widgets.Button;
 import com.smartgwt.client.widgets.events.ClickEvent;
@@ -6,8 +6,8 @@
 import com.smartgwt.client.widgets.events.CloseClickHandler;
 import com.smartgwt.client.widgets.events.CloseClickEvent;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.User;
 
 /** Button that opens view of datacage (DataCageWindow). */
 public class DatacageButton extends Button implements ClickHandler {

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacagePairWidget.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacagePairWidget.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
@@ -10,10 +10,10 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.ToLoad;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.ToLoad;
+import org.dive4elements.river.client.shared.model.User;
 
 
 /**

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacagePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacagePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,12 +1,12 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.User;
 
 import java.util.ArrayList;
 import java.util.List;

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageTwinPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageTwinPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -15,22 +15,22 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.StepForwardEvent;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-import de.intevation.flys.client.client.services.RemoveArtifactServiceAsync;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataItem;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.Recommendation.Facet;
-import de.intevation.flys.client.shared.model.Recommendation.Filter;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.StepForwardEvent;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.RemoveArtifactServiceAsync;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataItem;
+import org.dive4elements.river.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.DefaultDataItem;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Recommendation.Facet;
+import org.dive4elements.river.client.shared.model.Recommendation.Filter;
+import org.dive4elements.river.client.shared.model.User;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -66,11 +66,11 @@
 
     /** Service handle to clone and add artifacts to collection. */
     LoadArtifactServiceAsync loadArtifactService = GWT.create(
-            de.intevation.flys.client.client.services.LoadArtifactService.class);
+            org.dive4elements.river.client.client.services.LoadArtifactService.class);
 
     /** Service to remove artifacts from collection. */
     RemoveArtifactServiceAsync removeArtifactService = GWT.create(
-            de.intevation.flys.client.client.services.RemoveArtifactService.class);
+            org.dive4elements.river.client.client.services.RemoveArtifactService.class);
 
 
     public DatacageTwinPanel(User user) {

--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWidget.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWidget.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -18,19 +18,19 @@
 import com.smartgwt.client.widgets.tree.TreeGrid;
 import com.smartgwt.client.widgets.tree.TreeNode;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.DatacageDoubleClickHandler;
-import de.intevation.flys.client.client.event.DatacageHandler;
-import de.intevation.flys.client.client.services.MetaDataService;
-import de.intevation.flys.client.client.services.MetaDataServiceAsync;
-import de.intevation.flys.client.client.ui.ScreenLock;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.AttrList;
-import de.intevation.flys.client.shared.model.DataCageNode;
-import de.intevation.flys.client.shared.model.DataCageTree;
-import de.intevation.flys.client.shared.model.ToLoad;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.DatacageDoubleClickHandler;
+import org.dive4elements.river.client.client.event.DatacageHandler;
+import org.dive4elements.river.client.client.services.MetaDataService;
+import org.dive4elements.river.client.client.services.MetaDataServiceAsync;
+import org.dive4elements.river.client.client.ui.ScreenLock;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.AttrList;
+import org.dive4elements.river.client.shared.model.DataCageNode;
+import org.dive4elements.river.client.shared.model.DataCageTree;
+import org.dive4elements.river.client.shared.model.ToLoad;
+import org.dive4elements.river.client.shared.model.User;
 
 import java.util.ArrayList;
 import java.util.List;