changeset 5835:821a02bbfb4e

Fixed internal java dependencies
author Sascha L. Teichmann <teichmann@intevation.de>
date Thu, 25 Apr 2013 13:12:15 +0200
parents f507086aa94b
children 795218cf62eb
files flys-backend/pom.xml flys-client/pom.xml flys-client/src/main/java/org/dive4elements/river/client/FLYS.gwt.xml flys-client/src/main/java/org/dive4elements/river/client/client/Config.java flys-client/src/main/java/org/dive4elements/river/client/client/FLYS.java flys-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java flys-client/src/main/java/org/dive4elements/river/client/client/FLYSImages.java flys-client/src/main/java/org/dive4elements/river/client/client/FLYSResources.java flys-client/src/main/java/org/dive4elements/river/client/client/event/AdvanceHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/CollectionChangeEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/CollectionChangeHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/DatacageDoubleClickHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/DatacageHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/FilterHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasCollectionChangeHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasOutputModesChangeHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasOutputParameterChangeHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasPanHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasParameterChangeHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasRedrawRequestHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasStepBackHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasStepForwardHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/HasZoomHandlers.java flys-client/src/main/java/org/dive4elements/river/client/client/event/OnMoveEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/OnMoveHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputModesChangeEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputModesChangeHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputParameterChangeEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/OutputParameterChangeHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/PanEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/PanHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/ParameterChangeEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/ParameterChangeHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/RangeFilterEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/RedrawRequestEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/RedrawRequestHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/StepBackEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/StepBackHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/StepForwardEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/StepForwardHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/event/StringFilterEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/ZoomEvent.java flys-client/src/main/java/org/dive4elements/river/client/client/event/ZoomHandler.java flys-client/src/main/java/org/dive4elements/river/client/client/services/AddArtifactService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/AddArtifactServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/AdvanceService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/AdvanceServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ArtifactService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ArtifactServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CSVExportService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CSVExportServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ChartInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ChartInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionAttributeService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionAttributeServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionItemAttributeService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CollectionItemAttributeServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CreateCollectionService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CreateCollectionServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CrossSectionKMService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/CrossSectionKMServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DeleteCollectionService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DeleteCollectionServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeArtifactService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeArtifactServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeCollectionService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DescribeCollectionServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DischargeInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DischargeInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DistanceInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/DistanceInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/FeedService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/FeedServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/FixingsOverviewService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/FixingsOverviewServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GCService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GCServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GFIService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GFIServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GaugeInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GaugeInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GetArtifactService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/GetArtifactServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/LoadArtifactService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/LoadArtifactServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MapInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MapInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MapOutputService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MapOutputServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MapUrlService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MapUrlServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MetaDataService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/MetaDataServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ModuleService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ModuleServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/RemoveArtifactService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/RemoveArtifactServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ReportService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ReportServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/RiverServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/SedimentLoadInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/SedimentLoadInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionNameService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionNameServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionTTLService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/SetCollectionTTLServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/StepForwardService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/StepForwardServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ThemeListingService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/ThemeListingServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/UserCollectionsServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/UserService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/UserServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/services/WQInfoService.java flys-client/src/main/java/org/dive4elements/river/client/client/services/WQInfoServiceAsync.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/AbstractUIProvider.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/AutoIntegerPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/BooleanPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/CollectionView.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ContinuePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageButton.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacagePairWidget.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacagePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageTwinPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWidget.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWindow.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DemDatacagePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DigitizePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DistanceOnlyPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleArrayPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleInputPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleRangeOnlyPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleRangePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ExportPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSHeader.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSView.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSWorkspace.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/GaugeTimeRangePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/HWSDatacagePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ImgLink.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/IntegerRangePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/LinkSelection.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/LoadingPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationDistancePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationPicker.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/MapSelection.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ModuleSelection.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/MultiPeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/MultipleLocationPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/NoInputPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/OutputTab.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterList.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterMatrix.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterMatrixPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ProjectList.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/PropertyEditor.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/QSegmentedInputPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/RadioPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/RangePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/RangeTableFilter.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/RecommendationPairRecord.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/RiverInfoPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ScreenLock.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/SelectProvider.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/SingleLocationPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/StaticDataPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/StyleEditorWindow.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/TableDataPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/TableFilter.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/TextProvider.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ThemeNavigationPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/ThemePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/Toolbar.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/UIProvider.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/UserRGDProvider.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQAdaptedInputPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQInputPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQSimpleArrayPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelGroundPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/WspDatacagePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartOutputTab.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartToolbar.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualDatePointsEditor.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualPointsEditor.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualWSPEditor.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/MousePositionPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/NaviChartOutputTab.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/OverviewOutputTab.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/PanControl.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/PointRecord.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ZoomboxControl.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixEventSelect.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixGaugeSelectPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixLocationPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixMultiPeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixPeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixQSelectPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/CapabilitiesPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/DrawControl.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/ElevationWindow.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/ExternalWMSWindow.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/FloodMap.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfo.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfoWindow.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/LegendWindow.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapOutputTab.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPositionPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPrintPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPrintWindow.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapThemePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapToolbar.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MeasureControl.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/WMSLayersTree.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedCampaignChart.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedHeightsDatacagePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedMultiPeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedloadCampaignChart.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/CheckboxPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadDistancePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadEpochPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadOffEpochPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadPeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/DischargeInfoDataSource.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/DistanceInfoDataSource.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/LocationsTable.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/RangeTable.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQCampaignChart.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQMultiPeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQPeriodPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeInfoPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugePanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeRecord.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoListGrid.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationInfoPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationPanel.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationRecord.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/ClickableQDTable.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/ClickableWTable.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/QDTable.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/WQAutoTabSet.java flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/WTable.java flys-client/src/main/java/org/dive4elements/river/client/client/utils/DoubleValidator.java flys-client/src/main/java/org/dive4elements/river/client/client/utils/EnableDisableCmd.java flys-client/src/main/java/org/dive4elements/river/client/client/utils/IntegerValidator.java flys-client/src/main/java/org/dive4elements/river/client/client/utils/Validator.java flys-client/src/main/java/org/dive4elements/river/client/client/widgets/DischargeTablesChart.java flys-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinner.java flys-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinnerChangeListener.java flys-client/src/main/java/org/dive4elements/river/client/server/AddArtifactServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/AdvanceServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactDescriptionFactory.java flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactHelper.java flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/BaseServletContextListener.java flys-client/src/main/java/org/dive4elements/river/client/server/BedKMChartServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/BedloadKMChartServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/CSVExportServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java flys-client/src/main/java/org/dive4elements/river/client/server/ChartInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/ChartOutputServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/ChartServiceHelper.java flys-client/src/main/java/org/dive4elements/river/client/server/CollectionAttributeServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/CollectionHelper.java flys-client/src/main/java/org/dive4elements/river/client/server/CollectionItemAttributeServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/CreateCollectionServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/CrossSectionKMServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/DataFactory.java flys-client/src/main/java/org/dive4elements/river/client/server/DeleteCollectionServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/DescribeArtifactServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/DescribeCollectionServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoXML.java flys-client/src/main/java/org/dive4elements/river/client/server/DischargeTablesServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/DistanceInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/DistanceInfoXML.java flys-client/src/main/java/org/dive4elements/river/client/server/DoCollectionAction.java flys-client/src/main/java/org/dive4elements/river/client/server/ExportServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/FLYSArtifactCreator.java flys-client/src/main/java/org/dive4elements/river/client/server/FeedServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/FileUploadServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/FixingsKMChartServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/FixingsOverviewServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/GCServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/GFIServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/GGInATrustStrategy.java flys-client/src/main/java/org/dive4elements/river/client/server/GaugeInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/GetArtifactServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/LoadArtifactServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/LoggingConfigurator.java flys-client/src/main/java/org/dive4elements/river/client/server/LoginServlet.java flys-client/src/main/java/org/dive4elements/river/client/server/MapHelper.java flys-client/src/main/java/org/dive4elements/river/client/server/MapInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/MapOutputServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/MapPrintServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/MapUrlServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/MetaDataServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/ModuleServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/ProxyServlet.java flys-client/src/main/java/org/dive4elements/river/client/server/RemoteServiceServlet.java flys-client/src/main/java/org/dive4elements/river/client/server/RemoveArtifactServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/ReportServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/RiverInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/RiverServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/SQKMChartServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/SedimentLoadInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/SetCollectionNameServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/SetCollectionTTLServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/StepForwardServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/StyleHelper.java flys-client/src/main/java/org/dive4elements/river/client/server/ThemeListingServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/UserCollectionsServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/UserServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/WQInfoServiceImpl.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/Authentication.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/AuthenticationException.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/AuthenticationFactory.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/Authenticator.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/DefaultUser.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/User.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/UserClient.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/plain/Authenticator.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/Assertion.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/Authenticator.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/Namespaces.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/Request.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/Response.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/ServiceException.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/Signature.java flys-client/src/main/java/org/dive4elements/river/client/server/auth/was/User.java flys-client/src/main/java/org/dive4elements/river/client/server/features/Features.java flys-client/src/main/java/org/dive4elements/river/client/server/features/FeaturesNamespaceContext.java flys-client/src/main/java/org/dive4elements/river/client/server/features/XMLFileFeatures.java flys-client/src/main/java/org/dive4elements/river/client/server/filter/GGInAFilter.java flys-client/src/main/java/org/dive4elements/river/client/server/filter/NoCacheFilter.java flys-client/src/main/java/org/dive4elements/river/client/server/meta/Converter.java flys-client/src/main/java/org/dive4elements/river/client/shared/DoubleUtils.java flys-client/src/main/java/org/dive4elements/river/client/shared/FieldVerifier.java flys-client/src/main/java/org/dive4elements/river/client/shared/MapUtils.java flys-client/src/main/java/org/dive4elements/river/client/shared/Transform2D.java flys-client/src/main/java/org/dive4elements/river/client/shared/exceptions/AuthenticationException.java flys-client/src/main/java/org/dive4elements/river/client/shared/exceptions/ServerException.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Artifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ArtifactDescription.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ArtifactFilter.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/AttrList.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/AttributedTheme.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Axis.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/BBox.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/BooleanProperty.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/CalculationMessage.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Capabilities.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ChartArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ChartInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ChartMode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Collection.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/CollectionItem.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/CollectionItemAttribute.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/CollectionRecord.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ContactInformation.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Data.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DataCageNode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DataCageTree.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DataItem.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DataList.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DateAxis.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultArtifactDescription.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultCollection.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultCollectionItem.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultDataItem.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultFacet.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultGaugeInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultMeasurementStation.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultModule.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultOutputMode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultRiver.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultRiverInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultTheme.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DefaultUser.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DischargeInfoObject.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DischargeInfoObjectImpl.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DistanceInfoObject.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DistanceInfoObjectImpl.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DistanceInfoRecord.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DoubleArrayData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DoubleProperty.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/DoubleRangeData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ExportMode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Facet.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/FacetFilter.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/FacetRecord.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/FeatureInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/FeatureInfoResponse.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/FixAnalysisArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/FixFilter.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/FixingsOverviewInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Gauge.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/GaugeDischargeCurveArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/GaugeImpl.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/GaugeInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/IntDataItem.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/IntegerArrayData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/IntegerData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/IntegerOptionsData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/IntegerProperty.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/IntegerRangeData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/LongRangeData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/MINFOArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/MapArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/MapConfig.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/MapInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/MapMode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/MeasurementStation.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Module.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/NumberAxis.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/OutFilter.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/OutputMode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/OutputSettings.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/OverviewMode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Property.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/PropertyGroup.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/PropertySetting.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/RangeData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Recommendation.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ReportMode.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/River.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/RiverInfo.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/SedimentLoadInfoObject.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/SedimentLoadInfoObjectImpl.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/SedimentLoadInfoRecord.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Settings.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/StaticSQRelationArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/StringData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/StringOptionsData.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/StringProperty.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Style.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/StyleSetting.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/Theme.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ThemeList.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ToLoad.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/User.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/WINFOArtifact.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/WMSLayer.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/WQDataItem.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/WQInfoObject.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/WQInfoObjectImpl.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/WQInfoRecord.java flys-client/src/main/java/org/dive4elements/river/client/shared/model/ZoomObj.java flys-client/src/main/webapp/WEB-INF/web.xml flys-client/src/test/java/org/dive4elements/river/client/FLYSJUnit.gwt.xml
diffstat 468 files changed, 2225 insertions(+), 2227 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWindow.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DatacageWindow.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 java.util.ArrayList;
 import java.util.List;
@@ -9,28 +9,28 @@
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.Window;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-
-import de.intevation.flys.client.client.event.DatacageHandler;
-import de.intevation.flys.client.client.event.DatacageDoubleClickHandler;
-import de.intevation.flys.client.client.event.HasRedrawRequestHandlers;
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.client.event.RedrawRequestEvent;
-import de.intevation.flys.client.client.event.RedrawRequestEvent.Type;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
 
-import de.intevation.flys.client.client.services.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.event.DatacageHandler;
+import org.dive4elements.river.client.client.event.DatacageDoubleClickHandler;
+import org.dive4elements.river.client.client.event.HasRedrawRequestHandlers;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent.Type;
 
-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.ToLoad;
-import de.intevation.flys.client.shared.model.User;
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.client.services.LoadArtifactService;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+
+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.ToLoad;
+import org.dive4elements.river.client.shared.model.User;
+import org.dive4elements.river.client.shared.model.Recommendation;
 
 
 /** Window that access the datacageservice and shows a datacagewidget. */
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DemDatacagePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DemDatacagePanel.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 de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataItem;
-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.ToLoad;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataItem;
+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.ToLoad;
+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/DigitizePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DigitizePanel.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;
@@ -16,19 +16,19 @@
 import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
 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.services.MapInfoService;
-import de.intevation.flys.client.client.services.MapInfoServiceAsync;
-import de.intevation.flys.client.client.ui.map.FloodMap;
-import de.intevation.flys.client.client.ui.map.MapPanel;
-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.MapInfo;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.MapInfoService;
+import org.dive4elements.river.client.client.services.MapInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.map.FloodMap;
+import org.dive4elements.river.client.client.ui.map.MapPanel;
+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.MapInfo;
 
 import java.util.List;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DistanceOnlyPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DistanceOnlyPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
-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;
 
 import java.util.List;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DistancePanel.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.i18n.client.NumberFormat;
@@ -29,20 +29,20 @@
 import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
 import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.FilterHandler;
-import de.intevation.flys.client.client.event.RangeFilterEvent;
-import de.intevation.flys.client.client.event.StringFilterEvent;
-import de.intevation.flys.client.client.ui.range.DistanceInfoDataSource;
-import de.intevation.flys.client.client.ui.range.LocationsTable;
-import de.intevation.flys.client.client.ui.range.RangeTable;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.FilterHandler;
+import org.dive4elements.river.client.client.event.RangeFilterEvent;
+import org.dive4elements.river.client.client.event.StringFilterEvent;
+import org.dive4elements.river.client.client.ui.range.DistanceInfoDataSource;
+import org.dive4elements.river.client.client.ui.range.LocationsTable;
+import org.dive4elements.river.client.client.ui.range.RangeTable;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.LinkedHashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleArrayPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleArrayPanel.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.i18n.client.NumberFormat;
@@ -11,7 +11,7 @@
 import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
 import com.smartgwt.client.widgets.form.fields.events.FocusHandler;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 import java.util.Map;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleInputPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleInputPanel.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.i18n.client.NumberFormat;
@@ -11,12 +11,12 @@
 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.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.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/DoubleRangeOnlyPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleRangeOnlyPanel.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.i18n.client.NumberFormat;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleRangePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/DoubleRangePanel.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.i18n.client.NumberFormat;
@@ -10,7 +10,7 @@
 import com.smartgwt.client.widgets.form.fields.StaticTextItem;
 import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 import java.util.Map;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ExportPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ExportPanel.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 java.util.List;
 import java.util.MissingResourceException;
@@ -10,11 +10,11 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.ExportMode;
-import de.intevation.flys.client.shared.model.Facet;
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.ExportMode;
+import org.dive4elements.river.client.shared.model.Facet;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSHeader.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSHeader.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.i18n.client.LocaleInfo;
@@ -16,11 +16,11 @@
 import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.events.ClickHandler;
 
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.UserService;
-import de.intevation.flys.client.client.services.UserServiceAsync;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.UserService;
+import org.dive4elements.river.client.client.services.UserServiceAsync;
+import org.dive4elements.river.client.shared.model.User;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSView.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSView.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.Canvas;
 import com.smartgwt.client.widgets.layout.HLayout;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSWorkspace.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/FLYSWorkspace.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;
 
@@ -13,8 +13,8 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 import java.util.HashMap;
 import java.util.Map;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/GaugeTimeRangePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/GaugeTimeRangePanel.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.i18n.client.DateTimeFormat;
@@ -21,16 +21,16 @@
 import com.smartgwt.client.widgets.tab.Tab;
 import com.smartgwt.client.widgets.tab.TabSet;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.ui.range.DischargeInfoDataSource;
-import de.intevation.flys.client.client.widgets.DischargeTablesChart;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.LongRangeData;
-import de.intevation.flys.client.shared.model.RangeData;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.ui.range.DischargeInfoDataSource;
+import org.dive4elements.river.client.client.widgets.DischargeTablesChart;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.LongRangeData;
+import org.dive4elements.river.client.shared.model.RangeData;
 
 import java.util.ArrayList;
 import java.util.Date;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/HWSDatacagePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/HWSDatacagePanel.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,12 +8,12 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 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 de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
-import de.intevation.flys.client.shared.model.User;
+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.User;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ImgLink.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ImgLink.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.types.Overflow;
 import com.smartgwt.client.widgets.HTMLPane;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/IntegerRangePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/IntegerRangePanel.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.widgets.form.fields.FormItem;
 import com.smartgwt.client.widgets.form.fields.IntegerItem;
 import com.smartgwt.client.widgets.form.validator.IntegerRangeValidator;
 import com.smartgwt.client.widgets.form.validator.Validator;
 
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.IntegerRangeData;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.IntegerRangeData;
 
 
 public class IntegerRangePanel extends RangePanel {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LinkSelection.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LinkSelection.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;
 
@@ -13,13 +13,13 @@
 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.client.event.StepForwardEvent;
-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.StepForwardEvent;
+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;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LoadingPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LoadingPanel.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.Timer;
@@ -15,17 +15,17 @@
 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.HasStepBackHandlers;
-import de.intevation.flys.client.client.event.StepBackEvent;
-import de.intevation.flys.client.client.event.StepBackHandler;
-import de.intevation.flys.client.client.services.DescribeArtifactService;
-import de.intevation.flys.client.client.services.DescribeArtifactServiceAsync;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-import de.intevation.flys.client.shared.model.CalculationMessage;
-import de.intevation.flys.client.shared.model.DataList;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.HasStepBackHandlers;
+import org.dive4elements.river.client.client.event.StepBackEvent;
+import org.dive4elements.river.client.client.event.StepBackHandler;
+import org.dive4elements.river.client.client.services.DescribeArtifactService;
+import org.dive4elements.river.client.client.services.DescribeArtifactServiceAsync;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+import org.dive4elements.river.client.shared.model.CalculationMessage;
+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/LocationDistancePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationDistancePanel.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.i18n.client.NumberFormat;
@@ -38,21 +38,21 @@
 import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
 import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.FilterHandler;
-import de.intevation.flys.client.client.event.RangeFilterEvent;
-import de.intevation.flys.client.client.event.StringFilterEvent;
-import de.intevation.flys.client.client.services.DistanceInfoService;
-import de.intevation.flys.client.client.services.DistanceInfoServiceAsync;
-import de.intevation.flys.client.client.ui.range.DistanceInfoDataSource;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.DistanceInfoObject;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.FilterHandler;
+import org.dive4elements.river.client.client.event.RangeFilterEvent;
+import org.dive4elements.river.client.client.event.StringFilterEvent;
+import org.dive4elements.river.client.client.services.DistanceInfoService;
+import org.dive4elements.river.client.client.services.DistanceInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.range.DistanceInfoDataSource;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.DistanceInfoObject;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationPanel.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.i18n.client.NumberFormat;
@@ -14,9 +14,9 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 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;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationPicker.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/LocationPicker.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 java.util.LinkedHashMap;
 
@@ -22,10 +22,10 @@
 import com.smartgwt.client.widgets.grid.events.CellClickHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.FilterHandler;
-import de.intevation.flys.client.client.event.RangeFilterEvent;
-import de.intevation.flys.client.client.event.StringFilterEvent;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.FilterHandler;
+import org.dive4elements.river.client.client.event.RangeFilterEvent;
+import org.dive4elements.river.client.client.event.StringFilterEvent;
 
 /**
  * Bundle widgets and handler for a lacation input helper.
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/MapSelection.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/MapSelection.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;
 
@@ -6,8 +6,8 @@
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
+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/ModuleSelection.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ModuleSelection.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;
@@ -12,16 +12,16 @@
 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.services.ModuleService;
-import de.intevation.flys.client.client.services.ModuleServiceAsync;
-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.Module;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.ModuleService;
+import org.dive4elements.river.client.client.services.ModuleServiceAsync;
+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.Module;
 
 import java.util.LinkedHashMap;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/MultiPeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/MultiPeriodPanel.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.i18n.client.DateTimeFormat;
@@ -17,11 +17,11 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 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 de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
+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.Date;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/MultipleLocationPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/MultipleLocationPanel.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.i18n.client.NumberFormat;
@@ -14,17 +14,17 @@
 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.services.DistanceInfoService;
-import de.intevation.flys.client.client.services.DistanceInfoServiceAsync;
-import de.intevation.flys.client.client.ui.range.DistanceInfoDataSource;
-import de.intevation.flys.client.shared.DoubleUtils;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.DistanceInfoObject;
-import de.intevation.flys.client.shared.model.RangeData;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.services.DistanceInfoService;
+import org.dive4elements.river.client.client.services.DistanceInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.range.DistanceInfoDataSource;
+import org.dive4elements.river.client.shared.DoubleUtils;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.DistanceInfoObject;
+import org.dive4elements.river.client.shared.model.RangeData;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/NoInputPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/NoInputPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,9 +1,9 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.smartgwt.client.widgets.Canvas;
 
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
 
 
 public class NoInputPanel
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/OutputTab.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/OutputTab.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.smartgwt.client.widgets.Label;
 import com.smartgwt.client.widgets.tab.Tab;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.OutputMode;
 
 
 public class OutputTab extends Tab {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterList.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterList.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;
@@ -14,49 +14,49 @@
 import com.smartgwt.client.widgets.tab.Tab;
 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.AdvanceHandler;
-import de.intevation.flys.client.client.event.CollectionChangeEvent;
-import de.intevation.flys.client.client.event.CollectionChangeHandler;
-import de.intevation.flys.client.client.event.HasParameterChangeHandler;
-import de.intevation.flys.client.client.event.HasStepBackHandlers;
-import de.intevation.flys.client.client.event.HasStepForwardHandlers;
-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 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.client.services.AdvanceService;
-import de.intevation.flys.client.client.services.AdvanceServiceAsync;
-import de.intevation.flys.client.client.services.ArtifactService;
-import de.intevation.flys.client.client.services.ArtifactServiceAsync;
-import de.intevation.flys.client.client.services.ReportService;
-import de.intevation.flys.client.client.services.ReportServiceAsync;
-import de.intevation.flys.client.client.services.StepForwardService;
-import de.intevation.flys.client.client.services.StepForwardServiceAsync;
-import de.intevation.flys.client.client.ui.stationinfo.GaugePanel;
-import de.intevation.flys.client.client.ui.stationinfo.InfoPanel;
-import de.intevation.flys.client.client.ui.stationinfo.MeasurementStationPanel;
-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 de.intevation.flys.client.shared.model.ExportMode;
-import de.intevation.flys.client.shared.model.FixAnalysisArtifact;
-import de.intevation.flys.client.shared.model.MINFOArtifact;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.ReportMode;
-import de.intevation.flys.client.shared.model.River;
-import de.intevation.flys.client.shared.model.WINFOArtifact;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.AdvanceHandler;
+import org.dive4elements.river.client.client.event.CollectionChangeEvent;
+import org.dive4elements.river.client.client.event.CollectionChangeHandler;
+import org.dive4elements.river.client.client.event.HasParameterChangeHandler;
+import org.dive4elements.river.client.client.event.HasStepBackHandlers;
+import org.dive4elements.river.client.client.event.HasStepForwardHandlers;
+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 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.client.services.AdvanceService;
+import org.dive4elements.river.client.client.services.AdvanceServiceAsync;
+import org.dive4elements.river.client.client.services.ArtifactService;
+import org.dive4elements.river.client.client.services.ArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.ReportService;
+import org.dive4elements.river.client.client.services.ReportServiceAsync;
+import org.dive4elements.river.client.client.services.StepForwardService;
+import org.dive4elements.river.client.client.services.StepForwardServiceAsync;
+import org.dive4elements.river.client.client.ui.stationinfo.GaugePanel;
+import org.dive4elements.river.client.client.ui.stationinfo.InfoPanel;
+import org.dive4elements.river.client.client.ui.stationinfo.MeasurementStationPanel;
+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 org.dive4elements.river.client.shared.model.ExportMode;
+import org.dive4elements.river.client.shared.model.FixAnalysisArtifact;
+import org.dive4elements.river.client.shared.model.MINFOArtifact;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.ReportMode;
+import org.dive4elements.river.client.shared.model.River;
+import org.dive4elements.river.client.shared.model.WINFOArtifact;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterMatrix.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterMatrix.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.event.dom.client.ClickEvent;
@@ -14,10 +14,10 @@
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.DataItem;
-import de.intevation.flys.client.shared.model.IntegerOptionsData;
-import de.intevation.flys.client.shared.model.StringOptionsData;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.DataItem;
+import org.dive4elements.river.client.shared.model.IntegerOptionsData;
+import org.dive4elements.river.client.shared.model.StringOptionsData;
 
 import java.io.Serializable;
 import java.util.ArrayList;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterMatrixPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ParameterMatrixPanel.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.ui.HTML;
@@ -8,14 +8,14 @@
 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.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.IntegerOptionsData;
-import de.intevation.flys.client.shared.model.StringOptionsData;
+import org.dive4elements.river.client.client.FLYSConstants;
+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.IntegerOptionsData;
+import org.dive4elements.river.client.shared.model.StringOptionsData;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/PeriodPanel.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.i18n.client.DateTimeFormat;
@@ -11,12 +11,12 @@
 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.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.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.Date;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ProjectList.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ProjectList.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.i18n.client.DateTimeFormat;
@@ -45,38 +45,38 @@
 import com.smartgwt.client.widgets.menu.events.ClickHandler;
 import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
 
-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.FilterHandler;
-import de.intevation.flys.client.client.event.RangeFilterEvent;
-import de.intevation.flys.client.client.event.StringFilterEvent;
-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.CreateCollectionService;
-import de.intevation.flys.client.client.services.CreateCollectionServiceAsync;
-import de.intevation.flys.client.client.services.DeleteCollectionService;
-import de.intevation.flys.client.client.services.DeleteCollectionServiceAsync;
-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.SetCollectionNameService;
-import de.intevation.flys.client.client.services.SetCollectionNameServiceAsync;
-import de.intevation.flys.client.client.services.SetCollectionTTLService;
-import de.intevation.flys.client.client.services.SetCollectionTTLServiceAsync;
-import de.intevation.flys.client.client.services.UserCollectionsService;
-import de.intevation.flys.client.client.services.UserCollectionsServiceAsync;
-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.CollectionRecord;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.CollectionChangeEvent;
+import org.dive4elements.river.client.client.event.CollectionChangeHandler;
+import org.dive4elements.river.client.client.event.FilterHandler;
+import org.dive4elements.river.client.client.event.RangeFilterEvent;
+import org.dive4elements.river.client.client.event.StringFilterEvent;
+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.CreateCollectionService;
+import org.dive4elements.river.client.client.services.CreateCollectionServiceAsync;
+import org.dive4elements.river.client.client.services.DeleteCollectionService;
+import org.dive4elements.river.client.client.services.DeleteCollectionServiceAsync;
+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.SetCollectionNameService;
+import org.dive4elements.river.client.client.services.SetCollectionNameServiceAsync;
+import org.dive4elements.river.client.client.services.SetCollectionTTLService;
+import org.dive4elements.river.client.client.services.SetCollectionTTLServiceAsync;
+import org.dive4elements.river.client.client.services.UserCollectionsService;
+import org.dive4elements.river.client.client.services.UserCollectionsServiceAsync;
+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.CollectionRecord;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.User;
 
 import java.util.ArrayList;
 import java.util.Date;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/PropertyEditor.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/PropertyEditor.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 java.io.Serializable;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/QSegmentedInputPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/QSegmentedInputPanel.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.i18n.client.NumberFormat;
@@ -18,21 +18,21 @@
 import com.smartgwt.client.widgets.tab.Tab;
 import com.smartgwt.client.widgets.tab.TabSet;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.WQInfoService;
-import de.intevation.flys.client.client.services.WQInfoServiceAsync;
-import de.intevation.flys.client.client.ui.wq.QDTable;
-import de.intevation.flys.client.client.ui.wq.WTable;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.WQDataItem;
-import de.intevation.flys.client.shared.model.WQInfoObject;
-import de.intevation.flys.client.shared.model.WQInfoRecord;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.WQInfoService;
+import org.dive4elements.river.client.client.services.WQInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.wq.QDTable;
+import org.dive4elements.river.client.client.ui.wq.WTable;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.WQDataItem;
+import org.dive4elements.river.client.shared.model.WQInfoObject;
+import org.dive4elements.river.client.shared.model.WQInfoRecord;
 
 import java.util.ArrayList;
 import java.util.HashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RadioPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RadioPanel.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;
 
@@ -9,11 +9,11 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 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 de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
+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.LinkedHashMap;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RangePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RangePanel.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;
 
@@ -12,11 +12,11 @@
 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.Data;
-import de.intevation.flys.client.shared.model.DataItem;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.RangeData;
+import org.dive4elements.river.client.client.FLYSConstants;
+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.RangeData;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RangeTableFilter.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RangeTableFilter.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.form.fields.events.KeyUpHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.FilterHandler;
-import de.intevation.flys.client.client.event.RangeFilterEvent;
-import de.intevation.flys.client.client.utils.DoubleValidator;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.FilterHandler;
+import org.dive4elements.river.client.client.event.RangeFilterEvent;
+import org.dive4elements.river.client.client.utils.DoubleValidator;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RecommendationPairRecord.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RecommendationPairRecord.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Recommendation;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RiverInfoPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/RiverInfoPanel.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 java.util.Iterator;
 
@@ -9,9 +9,9 @@
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.shared.model.RiverInfo;
 
 /**
  * Panel to display information about a river.
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ScreenLock.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ScreenLock.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;
 
@@ -9,7 +9,7 @@
 import com.smartgwt.client.widgets.layout.Layout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 /** Basic static functionality to show spinning wheel. */
 public class ScreenLock {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/SelectProvider.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/SelectProvider.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.smartgwt.client.types.VerticalAlignment;
@@ -14,13 +14,13 @@
 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.client.event.StepForwardEvent;
-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.StepForwardEvent;
+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.Iterator;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/SingleLocationPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/SingleLocationPanel.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.i18n.client.NumberFormat;
 
@@ -6,7 +6,7 @@
 
 import com.smartgwt.client.widgets.grid.events.CellClickEvent;
 
-import de.intevation.flys.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.Data;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/StaticDataPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/StaticDataPanel.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,10 +8,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.Data;
-import de.intevation.flys.client.shared.model.DataItem;
-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.DataItem;
+import org.dive4elements.river.client.shared.model.DataList;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/StyleEditorWindow.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/StyleEditorWindow.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;
@@ -26,19 +26,19 @@
 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.services.CollectionItemAttributeService;
-import de.intevation.flys.client.client.services.CollectionItemAttributeServiceAsync;
-import de.intevation.flys.client.client.services.ThemeListingService;
-import de.intevation.flys.client.client.services.ThemeListingServiceAsync;
-import de.intevation.flys.client.client.utils.DoubleValidator;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItemAttribute;
-import de.intevation.flys.client.shared.model.FacetRecord;
-import de.intevation.flys.client.shared.model.Style;
-import de.intevation.flys.client.shared.model.StyleSetting;
-import de.intevation.flys.client.shared.model.Theme;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.CollectionItemAttributeService;
+import org.dive4elements.river.client.client.services.CollectionItemAttributeServiceAsync;
+import org.dive4elements.river.client.client.services.ThemeListingService;
+import org.dive4elements.river.client.client.services.ThemeListingServiceAsync;
+import org.dive4elements.river.client.client.utils.DoubleValidator;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItemAttribute;
+import org.dive4elements.river.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.Style;
+import org.dive4elements.river.client.shared.model.StyleSetting;
+import org.dive4elements.river.client.shared.model.Theme;
 
 import java.util.Arrays;
 import java.util.Iterator;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/TableDataPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/TableDataPanel.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.i18n.client.NumberFormat;
@@ -12,11 +12,11 @@
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 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.services.CSVExportService;
-import de.intevation.flys.client.client.services.CSVExportServiceAsync;
-import de.intevation.flys.client.shared.model.DataList;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.CSVExportService;
+import org.dive4elements.river.client.client.services.CSVExportServiceAsync;
+import org.dive4elements.river.client.shared.model.DataList;
 
 import java.util.List;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/TableFilter.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/TableFilter.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 java.util.ArrayList;
 import java.util.List;
@@ -13,9 +13,9 @@
 import com.smartgwt.client.widgets.form.fields.events.KeyUpHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.event.FilterHandler;
-import de.intevation.flys.client.client.event.StringFilterEvent;
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.FilterHandler;
+import org.dive4elements.river.client.client.event.StringFilterEvent;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/TextProvider.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/TextProvider.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;
 
@@ -15,12 +15,12 @@
 import com.smartgwt.client.widgets.form.validator.Validator;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-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.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/ThemeNavigationPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ThemeNavigationPanel.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 java.util.ArrayList;
 import java.util.List;
@@ -13,9 +13,9 @@
 import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.OnMoveEvent;
-import de.intevation.flys.client.client.event.OnMoveHandler;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.OnMoveEvent;
+import org.dive4elements.river.client.client.event.OnMoveHandler;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ThemePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/ThemePanel.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;
@@ -17,27 +17,27 @@
 import com.smartgwt.client.widgets.menu.events.ClickHandler;
 import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.HasOutputParameterChangeHandlers;
-import de.intevation.flys.client.client.event.HasRedrawRequestHandlers;
-import de.intevation.flys.client.client.event.OnMoveEvent;
-import de.intevation.flys.client.client.event.OnMoveHandler;
-import de.intevation.flys.client.client.event.OutputParameterChangeEvent;
-import de.intevation.flys.client.client.event.OutputParameterChangeHandler;
-import de.intevation.flys.client.client.event.RedrawRequestEvent;
-import de.intevation.flys.client.client.event.RedrawRequestEvent.Type;
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.client.services.CollectionAttributeService;
-import de.intevation.flys.client.client.services.CollectionAttributeServiceAsync;
-import de.intevation.flys.client.client.services.CollectionItemAttributeService;
-import de.intevation.flys.client.client.services.CollectionItemAttributeServiceAsync;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItemAttribute;
-import de.intevation.flys.client.shared.model.FacetRecord;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Theme;
-import de.intevation.flys.client.shared.model.ThemeList;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.HasOutputParameterChangeHandlers;
+import org.dive4elements.river.client.client.event.HasRedrawRequestHandlers;
+import org.dive4elements.river.client.client.event.OnMoveEvent;
+import org.dive4elements.river.client.client.event.OnMoveHandler;
+import org.dive4elements.river.client.client.event.OutputParameterChangeEvent;
+import org.dive4elements.river.client.client.event.OutputParameterChangeHandler;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent.Type;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.client.services.CollectionAttributeService;
+import org.dive4elements.river.client.client.services.CollectionAttributeServiceAsync;
+import org.dive4elements.river.client.client.services.CollectionItemAttributeService;
+import org.dive4elements.river.client.client.services.CollectionItemAttributeServiceAsync;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItemAttribute;
+import org.dive4elements.river.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.ThemeList;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/Toolbar.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/Toolbar.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.Overflow;
 import com.smartgwt.client.widgets.events.CloseClickEvent;
 import com.smartgwt.client.widgets.events.CloseClickHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.User;
 
 
 public abstract class Toolbar extends HLayout {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/UIProvider.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/UIProvider.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,14 +1,14 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import java.io.Serializable;
 
 import com.smartgwt.client.widgets.Canvas;
 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.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
 
 /**
  * This interface describes a method that creates a Canvas element displaying
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/UIProviderFactory.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,23 +1,23 @@
-package de.intevation.flys.client.client.ui;
+package org.dive4elements.river.client.client.ui;
 
 import com.google.gwt.core.client.GWT;
 
-import de.intevation.flys.client.client.ui.fixation.FixEventSelect;
-import de.intevation.flys.client.client.ui.fixation.FixFunctionSelect;
-import de.intevation.flys.client.client.ui.fixation.FixGaugeSelectPanel;
-import de.intevation.flys.client.client.ui.fixation.FixLocationPanel;
-import de.intevation.flys.client.client.ui.fixation.FixMultiPeriodPanel;
-import de.intevation.flys.client.client.ui.fixation.FixPeriodPanel;
-import de.intevation.flys.client.client.ui.fixation.FixQSelectPanel;
-import de.intevation.flys.client.client.ui.minfo.BedHeightsDatacagePanel;
-import de.intevation.flys.client.client.ui.minfo.BedMultiPeriodPanel;
-import de.intevation.flys.client.client.ui.minfo.CheckboxPanel;
-import de.intevation.flys.client.client.ui.minfo.SedLoadDistancePanel;
-import de.intevation.flys.client.client.ui.minfo.SedLoadEpochPanel;
-import de.intevation.flys.client.client.ui.minfo.SedLoadOffEpochPanel;
-import de.intevation.flys.client.client.ui.minfo.SedLoadPeriodPanel;
-import de.intevation.flys.client.client.ui.sq.SQPeriodPanel;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.ui.fixation.FixEventSelect;
+import org.dive4elements.river.client.client.ui.fixation.FixFunctionSelect;
+import org.dive4elements.river.client.client.ui.fixation.FixGaugeSelectPanel;
+import org.dive4elements.river.client.client.ui.fixation.FixLocationPanel;
+import org.dive4elements.river.client.client.ui.fixation.FixMultiPeriodPanel;
+import org.dive4elements.river.client.client.ui.fixation.FixPeriodPanel;
+import org.dive4elements.river.client.client.ui.fixation.FixQSelectPanel;
+import org.dive4elements.river.client.client.ui.minfo.BedHeightsDatacagePanel;
+import org.dive4elements.river.client.client.ui.minfo.BedMultiPeriodPanel;
+import org.dive4elements.river.client.client.ui.minfo.CheckboxPanel;
+import org.dive4elements.river.client.client.ui.minfo.SedLoadDistancePanel;
+import org.dive4elements.river.client.client.ui.minfo.SedLoadEpochPanel;
+import org.dive4elements.river.client.client.ui.minfo.SedLoadOffEpochPanel;
+import org.dive4elements.river.client.client.ui.minfo.SedLoadPeriodPanel;
+import org.dive4elements.river.client.client.ui.sq.SQPeriodPanel;
+import org.dive4elements.river.client.shared.model.User;
 
 /**
  * Depending on the provider the state declared, return a UIProvider.
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/UserRGDProvider.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/UserRGDProvider.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 java.util.List;
 
@@ -15,11 +15,11 @@
 import com.smartgwt.client.widgets.form.fields.UploadItem;
 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 de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
+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;
 
 
 public class UserRGDProvider
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQAdaptedInputPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQAdaptedInputPanel.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.i18n.client.NumberFormat;
@@ -25,21 +25,21 @@
 import com.smartgwt.client.widgets.tab.Tab;
 import com.smartgwt.client.widgets.tab.TabSet;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.WQInfoService;
-import de.intevation.flys.client.client.services.WQInfoServiceAsync;
-import de.intevation.flys.client.client.ui.wq.QDTable;
-import de.intevation.flys.client.client.ui.wq.WTable;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.WQDataItem;
-import de.intevation.flys.client.shared.model.WQInfoObject;
-import de.intevation.flys.client.shared.model.WQInfoRecord;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.WQInfoService;
+import org.dive4elements.river.client.client.services.WQInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.wq.QDTable;
+import org.dive4elements.river.client.client.ui.wq.WTable;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.WQDataItem;
+import org.dive4elements.river.client.shared.model.WQInfoObject;
+import org.dive4elements.river.client.shared.model.WQInfoRecord;
 
 import java.util.ArrayList;
 import java.util.HashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQInputPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQInputPanel.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.i18n.client.NumberFormat;
@@ -22,20 +22,20 @@
 import com.smartgwt.client.widgets.tab.Tab;
 import com.smartgwt.client.widgets.tab.TabSet;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.WQInfoService;
-import de.intevation.flys.client.client.services.WQInfoServiceAsync;
-import de.intevation.flys.client.client.ui.wq.QDTable;
-import de.intevation.flys.client.client.ui.wq.WTable;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.WQInfoObject;
-import de.intevation.flys.client.shared.model.WQInfoRecord;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.WQInfoService;
+import org.dive4elements.river.client.client.services.WQInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.wq.QDTable;
+import org.dive4elements.river.client.client.ui.wq.WTable;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.WQInfoObject;
+import org.dive4elements.river.client.shared.model.WQInfoRecord;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQSimpleArrayPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WQSimpleArrayPanel.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.i18n.client.NumberFormat;
@@ -17,27 +17,27 @@
 import com.smartgwt.client.widgets.tab.Tab;
 import com.smartgwt.client.widgets.tab.TabSet;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.GaugeInfoService;
-import de.intevation.flys.client.client.services.GaugeInfoServiceAsync;
-import de.intevation.flys.client.client.services.WQInfoService;
-import de.intevation.flys.client.client.services.WQInfoServiceAsync;
-import de.intevation.flys.client.client.ui.wq.ClickableQDTable;
-import de.intevation.flys.client.client.ui.wq.ClickableWTable;
-import de.intevation.flys.client.client.ui.wq.ClickableWTable.ClickMode;
-import de.intevation.flys.client.client.widgets.DischargeTablesChart;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.DoubleArrayData;
-import de.intevation.flys.client.shared.model.Gauge;
-import de.intevation.flys.client.shared.model.IntegerOptionsData;
-import de.intevation.flys.client.shared.model.WQInfoObject;
-import de.intevation.flys.client.shared.model.WQInfoRecord;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.GaugeInfoService;
+import org.dive4elements.river.client.client.services.GaugeInfoServiceAsync;
+import org.dive4elements.river.client.client.services.WQInfoService;
+import org.dive4elements.river.client.client.services.WQInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.wq.ClickableQDTable;
+import org.dive4elements.river.client.client.ui.wq.ClickableWTable;
+import org.dive4elements.river.client.client.ui.wq.ClickableWTable.ClickMode;
+import org.dive4elements.river.client.client.widgets.DischargeTablesChart;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.DoubleArrayData;
+import org.dive4elements.river.client.shared.model.Gauge;
+import org.dive4elements.river.client.shared.model.IntegerOptionsData;
+import org.dive4elements.river.client.shared.model.WQInfoObject;
+import org.dive4elements.river.client.shared.model.WQInfoRecord;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelGroundPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WaterlevelGroundPanel.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;
 
 public class WaterlevelGroundPanel extends DistancePanel {
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WspDatacagePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/WspDatacagePanel.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;
@@ -6,23 +6,23 @@
 import com.smartgwt.client.util.SC;
 import com.smartgwt.client.widgets.events.ClickEvent;
 
-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.StepForwardEvent;
-import de.intevation.flys.client.client.services.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-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.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.ToLoad;
-import de.intevation.flys.client.shared.model.User;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.StepForwardEvent;
+import org.dive4elements.river.client.client.services.LoadArtifactService;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+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.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.ToLoad;
+import org.dive4elements.river.client.shared.model.User;
 
 import java.util.List;
 import java.util.Map;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartOutputTab.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartOutputTab.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -10,26 +10,26 @@
 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.event.OutputParameterChangeEvent;
-import de.intevation.flys.client.client.event.OutputParameterChangeHandler;
-import de.intevation.flys.client.client.event.PanEvent;
-import de.intevation.flys.client.client.event.PanHandler;
-import de.intevation.flys.client.client.event.RedrawRequestEvent;
-import de.intevation.flys.client.client.event.RedrawRequestEvent.Type;
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.client.event.ZoomEvent;
-import de.intevation.flys.client.client.event.ZoomHandler;
-import de.intevation.flys.client.client.services.ChartInfoService;
-import de.intevation.flys.client.client.services.ChartInfoServiceAsync;
-import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.ui.OutputTab;
-import de.intevation.flys.client.shared.Transform2D;
-import de.intevation.flys.client.shared.model.Axis;
-import de.intevation.flys.client.shared.model.ChartInfo;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.ZoomObj;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.event.OutputParameterChangeEvent;
+import org.dive4elements.river.client.client.event.OutputParameterChangeHandler;
+import org.dive4elements.river.client.client.event.PanEvent;
+import org.dive4elements.river.client.client.event.PanHandler;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent.Type;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.client.event.ZoomEvent;
+import org.dive4elements.river.client.client.event.ZoomHandler;
+import org.dive4elements.river.client.client.services.ChartInfoService;
+import org.dive4elements.river.client.client.services.ChartInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.ui.OutputTab;
+import org.dive4elements.river.client.shared.Transform2D;
+import org.dive4elements.river.client.shared.model.Axis;
+import org.dive4elements.river.client.shared.model.ChartInfo;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.ZoomObj;
 
 import java.util.Date;
 import java.util.HashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -25,22 +25,22 @@
 import com.smartgwt.client.widgets.tab.Tab;
 import com.smartgwt.client.widgets.tab.TabSet;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.CollectionAttributeService;
-import de.intevation.flys.client.client.services.CollectionAttributeServiceAsync;
-import de.intevation.flys.client.client.utils.DoubleValidator;
-import de.intevation.flys.client.client.utils.IntegerValidator;
-import de.intevation.flys.client.shared.model.BooleanProperty;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.DoubleProperty;
-import de.intevation.flys.client.shared.model.IntegerProperty;
-import de.intevation.flys.client.shared.model.OutputSettings;
-import de.intevation.flys.client.shared.model.Property;
-import de.intevation.flys.client.shared.model.PropertyGroup;
-import de.intevation.flys.client.shared.model.PropertySetting;
-import de.intevation.flys.client.shared.model.Settings;
-import de.intevation.flys.client.shared.model.StringProperty;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.CollectionAttributeService;
+import org.dive4elements.river.client.client.services.CollectionAttributeServiceAsync;
+import org.dive4elements.river.client.client.utils.DoubleValidator;
+import org.dive4elements.river.client.client.utils.IntegerValidator;
+import org.dive4elements.river.client.shared.model.BooleanProperty;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.DoubleProperty;
+import org.dive4elements.river.client.shared.model.IntegerProperty;
+import org.dive4elements.river.client.shared.model.OutputSettings;
+import org.dive4elements.river.client.shared.model.Property;
+import org.dive4elements.river.client.shared.model.PropertyGroup;
+import org.dive4elements.river.client.shared.model.PropertySetting;
+import org.dive4elements.river.client.shared.model.Settings;
+import org.dive4elements.river.client.shared.model.StringProperty;
 
 import java.util.LinkedHashMap;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -13,22 +13,22 @@
 import com.smartgwt.client.widgets.menu.events.ClickHandler;
 import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.FeedServiceAsync;
-import de.intevation.flys.client.client.services.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.ui.ThemePanel;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DefaultArtifact;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.FacetRecord;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.Theme;
-import de.intevation.flys.client.shared.model.ThemeList;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.FeedServiceAsync;
+import org.dive4elements.river.client.client.services.LoadArtifactService;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.ui.ThemePanel;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DefaultArtifact;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.ThemeList;
 
 
 /**
@@ -50,7 +50,7 @@
     public static final String GRID_FIELD_ACTIONS = "actions";
 
     FeedServiceAsync feedService = GWT.create(
-        de.intevation.flys.client.client.services.FeedService.class);
+        org.dive4elements.river.client.client.services.FeedService.class);
 
 
     /** Constructor for a ChartThemePanel. */
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartToolbar.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartToolbar.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 
@@ -9,12 +9,12 @@
 import com.smartgwt.client.widgets.events.ClickEvent;
 import com.smartgwt.client.widgets.events.ClickHandler;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.ZoomEvent;
-import de.intevation.flys.client.client.event.ZoomHandler;
-import de.intevation.flys.client.client.ui.ImgLink;
-import de.intevation.flys.client.client.ui.Toolbar;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.ZoomEvent;
+import org.dive4elements.river.client.client.event.ZoomHandler;
+import org.dive4elements.river.client.client.ui.ImgLink;
+import org.dive4elements.river.client.client.ui.Toolbar;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/CrossSectionChartThemePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -19,21 +19,21 @@
 import com.smartgwt.client.widgets.menu.events.ClickHandler;
 import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.services.CrossSectionKMServiceAsync;
-import de.intevation.flys.client.client.services.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.widgets.KMSpinner;
-import de.intevation.flys.client.client.widgets.KMSpinnerChangeListener;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DefaultArtifact;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.FacetRecord;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Theme;
-import de.intevation.flys.client.shared.model.ThemeList;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.services.CrossSectionKMServiceAsync;
+import org.dive4elements.river.client.client.services.LoadArtifactService;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.widgets.KMSpinner;
+import org.dive4elements.river.client.client.widgets.KMSpinnerChangeListener;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DefaultArtifact;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.ThemeList;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -60,7 +60,7 @@
 
     /** Service to query measurement points of cross sections. */
     CrossSectionKMServiceAsync kmService = GWT.create(
-        de.intevation.flys.client.client.services.CrossSectionKMService.class);
+        org.dive4elements.river.client.client.services.CrossSectionKMService.class);
 
     /** UUID of the current "master" cross section. */
     protected String currentCSMasterUUID;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualDatePointsEditor.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualDatePointsEditor.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.DateTimeFormat;
@@ -27,13 +27,13 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItem;
-import de.intevation.flys.client.shared.model.Property;
-import de.intevation.flys.client.shared.model.PropertyGroup;
-import de.intevation.flys.client.shared.model.Settings;
-import de.intevation.flys.client.shared.model.StringProperty;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItem;
+import org.dive4elements.river.client.shared.model.Property;
+import org.dive4elements.river.client.shared.model.PropertyGroup;
+import org.dive4elements.river.client.shared.model.Settings;
+import org.dive4elements.river.client.shared.model.StringProperty;
 
 import java.util.Date;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualPointsEditor.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualPointsEditor.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.DateTimeFormat;
@@ -30,23 +30,23 @@
 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.RedrawRequestEvent;
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.client.services.FeedServiceAsync;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-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.Data;
-import de.intevation.flys.client.shared.model.DefaultArtifact;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.Property;
-import de.intevation.flys.client.shared.model.PropertyGroup;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.Settings;
-import de.intevation.flys.client.shared.model.StringProperty;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.client.services.FeedServiceAsync;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+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.Data;
+import org.dive4elements.river.client.shared.model.DefaultArtifact;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.Property;
+import org.dive4elements.river.client.shared.model.PropertyGroup;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Settings;
+import org.dive4elements.river.client.shared.model.StringProperty;
 
 import java.util.Date;
 import java.util.List;
@@ -78,11 +78,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 feed the artifact with new point-data. */
     FeedServiceAsync feedService = GWT.create(
-        de.intevation.flys.client.client.services.FeedService.class);
+        org.dive4elements.river.client.client.services.FeedService.class);
 
     /** UUID of artifact to feed. */
     protected String uuid;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualWSPEditor.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualWSPEditor.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -22,24 +22,24 @@
 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.RedrawRequestEvent;
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.client.services.FeedServiceAsync;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-import de.intevation.flys.client.client.utils.DoubleValidator;
-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.Data;
-import de.intevation.flys.client.shared.model.DefaultArtifact;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.Property;
-import de.intevation.flys.client.shared.model.PropertyGroup;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.Settings;
-import de.intevation.flys.client.shared.model.StringProperty;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.client.services.FeedServiceAsync;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.utils.DoubleValidator;
+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.Data;
+import org.dive4elements.river.client.shared.model.DefaultArtifact;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.Property;
+import org.dive4elements.river.client.shared.model.PropertyGroup;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Settings;
+import org.dive4elements.river.client.shared.model.StringProperty;
 
 import java.util.List;
 import java.util.Map;
@@ -65,11 +65,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 feed the artifact with new point-data. */
     FeedServiceAsync feedService = GWT.create(
-        de.intevation.flys.client.client.services.FeedService.class);
+        org.dive4elements.river.client.client.services.FeedService.class);
 
     /** UUID of artifact to feed. */
     protected String uuid;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/MousePositionPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/MousePositionPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import java.util.ArrayList;
 
@@ -8,7 +8,7 @@
 import com.smartgwt.client.widgets.events.MouseMoveEvent;
 import com.smartgwt.client.widgets.events.MouseMoveHandler;
 
-import de.intevation.flys.client.shared.Transform2D;
+import org.dive4elements.river.client.shared.Transform2D;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/NaviChartOutputTab.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/NaviChartOutputTab.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -27,15 +27,15 @@
 import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
 import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
 
-import de.intevation.flys.client.client.Config;
-
-import de.intevation.flys.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.Config;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.FixAnalysisArtifact;
-import de.intevation.flys.client.shared.model.FixFilter;
-import de.intevation.flys.client.shared.model.OutputMode;
+import org.dive4elements.river.client.client.ui.CollectionView;
+
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.FixAnalysisArtifact;
+import org.dive4elements.river.client.shared.model.FixFilter;
+import org.dive4elements.river.client.shared.model.OutputMode;
 
 import java.util.Date;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/OverviewOutputTab.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/OverviewOutputTab.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,14 +1,14 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.core.client.GWT;
 
-import de.intevation.flys.client.client.event.OutputParameterChangeHandler;
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.ui.ImgLink;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Theme;
+import org.dive4elements.river.client.client.event.OutputParameterChangeHandler;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.ui.ImgLink;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Theme;
 
 
 public class OverviewOutputTab extends ChartOutputTab  {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/PanControl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/PanControl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,9 +18,9 @@
 import com.smartgwt.client.widgets.events.MouseUpEvent;
 import com.smartgwt.client.widgets.events.MouseUpHandler;
 
-import de.intevation.flys.client.client.event.HasPanHandlers;
-import de.intevation.flys.client.client.event.PanEvent;
-import de.intevation.flys.client.client.event.PanHandler;
+import org.dive4elements.river.client.client.event.HasPanHandlers;
+import org.dive4elements.river.client.client.event.PanEvent;
+import org.dive4elements.river.client.client.event.PanHandler;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/PointRecord.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/PointRecord.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONBoolean;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ZoomboxControl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ZoomboxControl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.chart;
+package org.dive4elements.river.client.client.ui.chart;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,9 +18,9 @@
 import com.smartgwt.client.widgets.events.MouseUpEvent;
 import com.smartgwt.client.widgets.events.MouseUpHandler;
 
-import de.intevation.flys.client.client.event.HasZoomHandlers;
-import de.intevation.flys.client.client.event.ZoomEvent;
-import de.intevation.flys.client.client.event.ZoomHandler;
+import org.dive4elements.river.client.client.event.HasZoomHandlers;
+import org.dive4elements.river.client.client.event.ZoomEvent;
+import org.dive4elements.river.client.client.event.ZoomHandler;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixEventSelect.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixEventSelect.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -11,17 +11,17 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
-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.IntDataItem;
-import de.intevation.flys.client.shared.model.IntegerArrayData;
-import de.intevation.flys.client.shared.model.FixingsOverviewInfo.FixEvent;
+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.IntDataItem;
+import org.dive4elements.river.client.shared.model.IntegerArrayData;
+import org.dive4elements.river.client.shared.model.FixingsOverviewInfo.FixEvent;
 
-import de.intevation.flys.client.client.services.FixingsOverviewService;
-import de.intevation.flys.client.client.services.FixingsOverviewServiceAsync;
+import org.dive4elements.river.client.client.services.FixingsOverviewService;
+import org.dive4elements.river.client.client.services.FixingsOverviewServiceAsync;
 
 /**
  * This UIProvider lets you select events.
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixFunctionSelect.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import com.smartgwt.client.types.VerticalAlignment;
 import com.smartgwt.client.widgets.Canvas;
@@ -8,11 +8,11 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 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 de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
+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.HashMap;
 import java.util.Iterator;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixGaugeSelectPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixGaugeSelectPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import com.google.gwt.core.client.GWT;
 
@@ -10,12 +10,12 @@
 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.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.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.LinkedHashMap;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixLocationPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixLocationPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -15,14 +15,14 @@
 import com.smartgwt.client.widgets.form.fields.events.BlurHandler;
 import com.smartgwt.client.widgets.form.fields.events.BlurEvent;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.ui.DoubleRangePanel;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.ui.DoubleRangePanel;
 
-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.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;
 /**
  * This UIProvider creates a panel for location or distance input.
  *
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixMultiPeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixMultiPeriodPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.DateTimeFormat;
@@ -17,12 +17,12 @@
 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.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.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.Date;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixPeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixPeriodPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.DateTimeFormat;
@@ -11,13 +11,13 @@
 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.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.FixingsOverviewInfo.FixEvent;
+import org.dive4elements.river.client.client.FLYSConstants;
+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.FixingsOverviewInfo.FixEvent;
 
 import java.util.ArrayList;
 import java.util.Date;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixQSelectPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixQSelectPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,13 +1,13 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import com.google.gwt.core.client.GWT;
 
 import com.smartgwt.client.widgets.Canvas;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
 
 /**
  * This UIProvider creates a panel for location or distance input.
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/fixation/FixationPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.fixation;
+package org.dive4elements.river.client.client.ui.fixation;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.DateTimeFormat;
@@ -27,16 +27,16 @@
 import com.smartgwt.client.widgets.tab.Tab;
 import com.smartgwt.client.widgets.tab.TabSet;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.FixingsOverviewService;
-import de.intevation.flys.client.client.services.FixingsOverviewServiceAsync;
-import de.intevation.flys.client.client.ui.AbstractUIProvider;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.FixAnalysisArtifact;
-import de.intevation.flys.client.shared.model.FixFilter;
-import de.intevation.flys.client.shared.model.FixingsOverviewInfo;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.FixingsOverviewService;
+import org.dive4elements.river.client.client.services.FixingsOverviewServiceAsync;
+import org.dive4elements.river.client.client.ui.AbstractUIProvider;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.FixAnalysisArtifact;
+import org.dive4elements.river.client.shared.model.FixFilter;
+import org.dive4elements.river.client.shared.model.FixingsOverviewInfo;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -342,7 +342,7 @@
 
 
     private native void createCallback() /*-{
-        $wnd.fixationCallback = @de.intevation.flys.client.client.ui.fixation.FixationPanel::helperCallback(ZLjava/lang/String;);
+        $wnd.fixationCallback = @org.dive4elements.river.client.client.ui.fixation.FixationPanel::helperCallback(ZLjava/lang/String;);
     }-*/;
 
     private static void helperCallback(boolean checked, String name) {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/CapabilitiesPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/CapabilitiesPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Grid;
@@ -9,9 +9,9 @@
 import com.smartgwt.client.widgets.layout.Layout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.shared.model.Capabilities;
-import de.intevation.flys.client.shared.model.ContactInformation;
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.Capabilities;
+import org.dive4elements.river.client.shared.model.ContactInformation;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 public class CapabilitiesPanel extends VLayout {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/DrawControl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/DrawControl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 import com.smartgwt.client.types.SelectionType;
@@ -12,8 +12,8 @@
 import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.utils.EnableDisableCmd;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.utils.EnableDisableCmd;
 
 import java.util.LinkedHashMap;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/ElevationWindow.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/ElevationWindow.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -38,7 +38,7 @@
 import org.gwtopenmaps.openlayers.client.layer.VectorOptions;
 import org.gwtopenmaps.openlayers.client.util.Attributes;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/ExternalWMSWindow.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/ExternalWMSWindow.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,13 +21,13 @@
 import com.smartgwt.client.widgets.layout.Layout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.shared.model.Capabilities;
-import de.intevation.flys.client.shared.model.WMSLayer;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.GCService;
-import de.intevation.flys.client.client.services.GCServiceAsync;
-import de.intevation.flys.client.client.services.MapUrlService;
-import de.intevation.flys.client.client.services.MapUrlServiceAsync;
+import org.dive4elements.river.client.shared.model.Capabilities;
+import org.dive4elements.river.client.shared.model.WMSLayer;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.GCService;
+import org.dive4elements.river.client.client.services.GCServiceAsync;
+import org.dive4elements.river.client.client.services.MapUrlService;
+import org.dive4elements.river.client.client.services.MapUrlServiceAsync;
 
 
 public class ExternalWMSWindow extends Window {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/FloodMap.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/FloodMap.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import org.gwtopenmaps.openlayers.client.Bounds;
 import org.gwtopenmaps.openlayers.client.LonLat;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfo.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfo.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import java.util.List;
 
@@ -13,16 +13,16 @@
 import org.gwtopenmaps.openlayers.client.Pixel;
 import org.gwtopenmaps.openlayers.client.event.MapClickListener;
 
-import de.intevation.flys.client.shared.model.FeatureInfo;
+import org.dive4elements.river.client.shared.model.FeatureInfo;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.GFIService;
-import de.intevation.flys.client.client.services.GFIServiceAsync;
-import de.intevation.flys.client.shared.model.FacetRecord;
-import de.intevation.flys.client.shared.model.Theme;
-import de.intevation.flys.client.shared.model.AttributedTheme;
-import de.intevation.flys.client.shared.model.FeatureInfoResponse;
-import de.intevation.flys.client.client.ui.ThemePanel;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.GFIService;
+import org.dive4elements.river.client.client.services.GFIServiceAsync;
+import org.dive4elements.river.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.AttributedTheme;
+import org.dive4elements.river.client.shared.model.FeatureInfoResponse;
+import org.dive4elements.river.client.client.ui.ThemePanel;
 
 
 public class GetFeatureInfo implements MapClickListener {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfoWindow.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfoWindow.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 
@@ -10,9 +10,9 @@
 import com.smartgwt.client.widgets.viewer.DetailViewerField;
 import com.smartgwt.client.widgets.viewer.DetailViewerRecord;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.FeatureInfo;
-import de.intevation.flys.client.shared.model.FeatureInfoResponse;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.FeatureInfo;
+import org.dive4elements.river.client.shared.model.FeatureInfoResponse;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/LegendWindow.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/LegendWindow.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import java.util.List;
 
@@ -11,10 +11,10 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.shared.MapUtils;
-import de.intevation.flys.client.shared.model.AttributedTheme;
-import de.intevation.flys.client.shared.model.Theme;
-import de.intevation.flys.client.shared.model.ThemeList;
+import org.dive4elements.river.client.shared.MapUtils;
+import org.dive4elements.river.client.shared.model.AttributedTheme;
+import org.dive4elements.river.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.ThemeList;
 
 
 public class LegendWindow extends Window {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapOutputTab.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapOutputTab.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -14,36 +14,36 @@
 import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
 import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.event.OutputParameterChangeEvent;
-import de.intevation.flys.client.client.event.OutputParameterChangeHandler;
-import de.intevation.flys.client.client.event.RedrawRequestEvent;
-import de.intevation.flys.client.client.event.RedrawRequestHandler;
-import de.intevation.flys.client.client.services.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-import de.intevation.flys.client.client.services.MapOutputService;
-import de.intevation.flys.client.client.services.MapOutputServiceAsync;
-import de.intevation.flys.client.client.services.StepForwardService;
-import de.intevation.flys.client.client.services.StepForwardServiceAsync;
-import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.ui.OutputTab;
-import de.intevation.flys.client.client.ui.ThemePanel;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-import de.intevation.flys.client.shared.model.AttributedTheme;
-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.MapConfig;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.Theme;
-import de.intevation.flys.client.shared.model.ThemeList;
-import de.intevation.flys.client.shared.model.WMSLayer;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.event.OutputParameterChangeEvent;
+import org.dive4elements.river.client.client.event.OutputParameterChangeHandler;
+import org.dive4elements.river.client.client.event.RedrawRequestEvent;
+import org.dive4elements.river.client.client.event.RedrawRequestHandler;
+import org.dive4elements.river.client.client.services.LoadArtifactService;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.MapOutputService;
+import org.dive4elements.river.client.client.services.MapOutputServiceAsync;
+import org.dive4elements.river.client.client.services.StepForwardService;
+import org.dive4elements.river.client.client.services.StepForwardServiceAsync;
+import org.dive4elements.river.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.ui.OutputTab;
+import org.dive4elements.river.client.client.ui.ThemePanel;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+import org.dive4elements.river.client.shared.model.AttributedTheme;
+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.MapConfig;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.ThemeList;
+import org.dive4elements.river.client.shared.model.WMSLayer;
 
 import java.util.HashMap;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.AbsolutePanel;
 
-import de.intevation.flys.client.shared.model.BBox;
-import de.intevation.flys.client.shared.model.MapInfo;
+import org.dive4elements.river.client.shared.model.BBox;
+import org.dive4elements.river.client.shared.model.MapInfo;
 
 import org.gwtopenmaps.openlayers.client.Bounds;
 import org.gwtopenmaps.openlayers.client.MapWidget;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPositionPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPositionPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.i18n.client.NumberFormat;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPrintPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPrintPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -17,20 +17,20 @@
 import org.gwtopenmaps.openlayers.client.Bounds;
 import org.gwtopenmaps.openlayers.client.Map;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.CollectionAttributeService;
-import de.intevation.flys.client.client.services.CollectionAttributeServiceAsync;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.OutputSettings;
-import de.intevation.flys.client.shared.model.Property;
-import de.intevation.flys.client.shared.model.PropertySetting;
-import de.intevation.flys.client.shared.model.Settings;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.CollectionAttributeService;
+import org.dive4elements.river.client.client.services.CollectionAttributeServiceAsync;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.OutputSettings;
+import org.dive4elements.river.client.shared.model.Property;
+import org.dive4elements.river.client.shared.model.PropertySetting;
+import org.dive4elements.river.client.shared.model.Settings;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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 java.util.ArrayList;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPrintWindow.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapPrintWindow.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.smartgwt.client.widgets.Window;
 import com.google.gwt.core.client.GWT;
 
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 public class MapPrintWindow extends Window {
     protected FLYSConstants MSG = GWT.create(FLYSConstants.class);
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapThemePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapThemePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 
@@ -15,13 +15,13 @@
 import com.smartgwt.client.widgets.menu.events.ClickHandler;
 import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.ui.CollectionView;
-import de.intevation.flys.client.client.ui.ThemePanel;
-import de.intevation.flys.client.shared.model.AttributedTheme;
-import de.intevation.flys.client.shared.model.FacetRecord;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Theme;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.ui.CollectionView;
+import org.dive4elements.river.client.client.ui.ThemePanel;
+import org.dive4elements.river.client.shared.model.AttributedTheme;
+import org.dive4elements.river.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Theme;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapToolbar.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapToolbar.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 
@@ -13,15 +13,15 @@
 import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.ui.ImgLink;
-import de.intevation.flys.client.client.ui.Toolbar;
-import de.intevation.flys.client.client.utils.EnableDisableCmd;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.Property;
-import de.intevation.flys.client.shared.model.PropertySetting;
-import de.intevation.flys.client.shared.model.Settings;
-import de.intevation.flys.client.shared.model.ThemeList;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.ui.ImgLink;
+import org.dive4elements.river.client.client.ui.Toolbar;
+import org.dive4elements.river.client.client.utils.EnableDisableCmd;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.Property;
+import org.dive4elements.river.client.shared.model.PropertySetting;
+import org.dive4elements.river.client.shared.model.Settings;
+import org.dive4elements.river.client.shared.model.ThemeList;
 
 import java.util.List;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MeasureControl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/MeasureControl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -17,8 +17,8 @@
 import org.gwtopenmaps.openlayers.client.handler.PathHandler;
 import org.gwtopenmaps.openlayers.client.handler.PolygonHandler;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.utils.EnableDisableCmd;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.utils.EnableDisableCmd;
 
 
 public class MeasureControl extends HLayout {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/WMSLayersTree.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/map/WMSLayersTree.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.map;
+package org.dive4elements.river.client.client.ui.map;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,8 +10,8 @@
 import com.smartgwt.client.widgets.tree.TreeGrid;
 import com.smartgwt.client.widgets.tree.TreeNode;
 
-import de.intevation.flys.client.shared.model.Capabilities;
-import de.intevation.flys.client.shared.model.WMSLayer;
+import org.dive4elements.river.client.shared.model.Capabilities;
+import org.dive4elements.river.client.shared.model.WMSLayer;
 
 
 public class WMSLayersTree extends TreeGrid {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedCampaignChart.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedCampaignChart.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.json.client.JSONNumber;
@@ -9,8 +9,8 @@
 import com.smartgwt.client.widgets.events.ResizedHandler;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 public class BedCampaignChart extends VLayout {
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedHeightsDatacagePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedHeightsDatacagePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import com.google.gwt.core.client.GWT;
 
@@ -15,31 +15,31 @@
 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.LoadArtifactService;
-import de.intevation.flys.client.client.services.LoadArtifactServiceAsync;
-import de.intevation.flys.client.client.services.RemoveArtifactService;
-import de.intevation.flys.client.client.services.RemoveArtifactServiceAsync;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.FLYSConstants;
 
-import de.intevation.flys.client.client.ui.DatacagePairWidget;
-import de.intevation.flys.client.client.ui.DatacageTwinPanel;
-import de.intevation.flys.client.client.ui.RecommendationPairRecord;
+import org.dive4elements.river.client.client.event.StepForwardEvent;
 
-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 org.dive4elements.river.client.client.services.LoadArtifactService;
+import org.dive4elements.river.client.client.services.LoadArtifactServiceAsync;
+import org.dive4elements.river.client.client.services.RemoveArtifactService;
+import org.dive4elements.river.client.client.services.RemoveArtifactServiceAsync;
 
-import de.intevation.flys.client.shared.model.Recommendation.Facet;
-import de.intevation.flys.client.shared.model.Recommendation.Filter;
+import org.dive4elements.river.client.client.ui.DatacagePairWidget;
+import org.dive4elements.river.client.client.ui.DatacageTwinPanel;
+import org.dive4elements.river.client.client.ui.RecommendationPairRecord;
 
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.User;
+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.Recommendation.Facet;
+import org.dive4elements.river.client.shared.model.Recommendation.Filter;
+
+import org.dive4elements.river.client.shared.model.Recommendation;
+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 BedHeightsDatacagePanel(User user) {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedMultiPeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedMultiPeriodPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.events.ResizedEvent;
 import com.smartgwt.client.widgets.events.ResizedHandler;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.ui.MultiPeriodPanel;
+import org.dive4elements.river.client.client.ui.MultiPeriodPanel;
 
 public class BedMultiPeriodPanel
 extends MultiPeriodPanel
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedloadCampaignChart.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/BedloadCampaignChart.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.json.client.JSONNumber;
@@ -9,8 +9,8 @@
 import com.smartgwt.client.widgets.events.ResizedHandler;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 public class BedloadCampaignChart extends VLayout {
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/CheckboxPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/CheckboxPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -14,12 +14,12 @@
 import com.smartgwt.client.widgets.layout.HLayout;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.ui.AbstractUIProvider;
-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.ui.AbstractUIProvider;
+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;
 
 public class CheckboxPanel extends AbstractUIProvider {
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadDistancePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadDistancePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import java.util.List;
 
@@ -13,18 +13,18 @@
 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.ui.AbstractUIProvider;
-import de.intevation.flys.client.client.ui.DoubleRangeOnlyPanel;
-import de.intevation.flys.client.client.ui.DoubleRangePanel;
-import de.intevation.flys.client.client.ui.LocationPicker;
-import de.intevation.flys.client.client.ui.range.DistanceInfoDataSource;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.Config;
+import org.dive4elements.river.client.client.ui.AbstractUIProvider;
+import org.dive4elements.river.client.client.ui.DoubleRangeOnlyPanel;
+import org.dive4elements.river.client.client.ui.DoubleRangePanel;
+import org.dive4elements.river.client.client.ui.LocationPicker;
+import org.dive4elements.river.client.client.ui.range.DistanceInfoDataSource;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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;
 
 
 public class SedLoadDistancePanel
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadEpochPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadEpochPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,18 +24,18 @@
 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.services.SedimentLoadInfoService;
-import de.intevation.flys.client.client.services.SedimentLoadInfoServiceAsync;
-import de.intevation.flys.client.client.ui.AbstractUIProvider;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.SedimentLoadInfoObject;
-import de.intevation.flys.client.shared.model.SedimentLoadInfoRecord;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.services.SedimentLoadInfoService;
+import org.dive4elements.river.client.client.services.SedimentLoadInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.AbstractUIProvider;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.SedimentLoadInfoObject;
+import org.dive4elements.river.client.shared.model.SedimentLoadInfoRecord;
 
 
 public class SedLoadEpochPanel
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadOffEpochPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadOffEpochPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,18 +17,18 @@
 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.services.SedimentLoadInfoService;
-import de.intevation.flys.client.client.services.SedimentLoadInfoServiceAsync;
-import de.intevation.flys.client.client.ui.PeriodPanel;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.SedimentLoadInfoObject;
-import de.intevation.flys.client.shared.model.SedimentLoadInfoRecord;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.services.SedimentLoadInfoService;
+import org.dive4elements.river.client.client.services.SedimentLoadInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.PeriodPanel;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.SedimentLoadInfoObject;
+import org.dive4elements.river.client.shared.model.SedimentLoadInfoRecord;
 
 
 public class SedLoadOffEpochPanel
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadPeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/minfo/SedLoadPeriodPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.minfo;
+package org.dive4elements.river.client.client.ui.minfo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,18 +17,18 @@
 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.services.SedimentLoadInfoService;
-import de.intevation.flys.client.client.services.SedimentLoadInfoServiceAsync;
-import de.intevation.flys.client.client.ui.AbstractUIProvider;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-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.SedimentLoadInfoObject;
-import de.intevation.flys.client.shared.model.SedimentLoadInfoRecord;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.client.services.SedimentLoadInfoService;
+import org.dive4elements.river.client.client.services.SedimentLoadInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.AbstractUIProvider;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+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.SedimentLoadInfoObject;
+import org.dive4elements.river.client.shared.model.SedimentLoadInfoRecord;
 
 
 public class SedLoadPeriodPanel
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/DischargeInfoDataSource.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/DischargeInfoDataSource.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.range;
+package org.dive4elements.river.client.client.ui.range;
 
 import com.google.gwt.core.client.GWT;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/DistanceInfoDataSource.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/DistanceInfoDataSource.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.range;
+package org.dive4elements.river.client.client.ui.range;
 
 import com.google.gwt.core.client.GWT;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/LocationsTable.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/LocationsTable.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.range;
+package org.dive4elements.river.client.client.ui.range;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -11,7 +11,7 @@
 
 import com.smartgwt.client.widgets.grid.CellFormatter;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/RangeTable.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/range/RangeTable.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.range;
+package org.dive4elements.river.client.client.ui.range;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -10,7 +10,7 @@
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 import com.smartgwt.client.widgets.grid.CellFormatter;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQCampaignChart.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQCampaignChart.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.sq;
+package org.dive4elements.river.client.client.ui.sq;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.json.client.JSONNumber;
@@ -9,8 +9,8 @@
 import com.smartgwt.client.widgets.events.ResizedHandler;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.Config;
-import de.intevation.flys.client.shared.model.Artifact;
+import org.dive4elements.river.client.client.Config;
+import org.dive4elements.river.client.shared.model.Artifact;
 
 
 public class SQCampaignChart extends VLayout {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQMultiPeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQMultiPeriodPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.ui.sq;
+package org.dive4elements.river.client.client.ui.sq;
 
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.events.ResizedEvent;
 import com.smartgwt.client.widgets.events.ResizedHandler;
 
-import de.intevation.flys.client.client.ui.MultiPeriodPanel;
+import org.dive4elements.river.client.client.ui.MultiPeriodPanel;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQPeriodPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/sq/SQPeriodPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.client.ui.sq;
+package org.dive4elements.river.client.client.ui.sq;
 
 import com.google.gwt.core.client.GWT;
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.events.ResizedEvent;
 import com.smartgwt.client.widgets.events.ResizedHandler;
 
-import de.intevation.flys.client.client.ui.PeriodPanel;
+import org.dive4elements.river.client.client.ui.PeriodPanel;
 
 public class SQPeriodPanel extends PeriodPanel implements ResizedHandler {
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeInfoPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeInfoPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -9,9 +9,9 @@
 import com.smartgwt.client.widgets.layout.VLayout;
 import com.smartgwt.client.widgets.Label;
 
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.GaugeInfo;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.GaugeInfo;
 
 public class GaugeInfoPanel extends VLayout {
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeListGrid.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,12 +12,12 @@
 import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
 import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
 
-import de.intevation.flys.client.client.FLYS;
-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.GaugeInfo;
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.client.FLYS;
+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.GaugeInfo;
+import org.dive4elements.river.client.shared.model.RiverInfo;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugePanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugePanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.shared.model.RiverInfo;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeRecord.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/GaugeRecord.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,10 +1,10 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.GaugeInfo;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.GaugeInfo;
 
 /**
  * @author <a href="mailto:bjoern.ricks@intevation.de">Björn Ricks</a>
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoListGrid.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoListGrid.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
 import com.smartgwt.client.widgets.Canvas;
@@ -6,11 +6,11 @@
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataList;
+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/ui/stationinfo/InfoPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/InfoPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
 
@@ -6,12 +6,12 @@
 import com.smartgwt.client.widgets.Canvas;
 import com.smartgwt.client.widgets.layout.SectionStackSection;
 import com.smartgwt.client.widgets.layout.VLayout;
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.client.services.RiverInfoService;
-import de.intevation.flys.client.client.services.RiverInfoServiceAsync;
-import de.intevation.flys.client.client.ui.RiverInfoPanel;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.services.RiverInfoService;
+import org.dive4elements.river.client.client.services.RiverInfoServiceAsync;
+import org.dive4elements.river.client.client.ui.RiverInfoPanel;
+import org.dive4elements.river.client.shared.model.DataList;
+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/ui/stationinfo/MeasurementStationInfoPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationInfoPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import java.util.Date;
 
@@ -8,8 +8,8 @@
 import com.google.gwt.user.client.ui.Grid;
 import com.smartgwt.client.widgets.layout.VLayout;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.MeasurementStation;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.MeasurementStation;
 
 public class MeasurementStationInfoPanel extends VLayout {
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationListGrid.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
 
@@ -10,9 +10,9 @@
 import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
 import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
 
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.shared.model.MeasurementStation;
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.shared.model.MeasurementStation;
+import org.dive4elements.river.client.shared.model.RiverInfo;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationPanel.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationPanel.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,9 +1,9 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import de.intevation.flys.client.client.FLYS;
-import de.intevation.flys.client.shared.model.RiverInfo;
+import org.dive4elements.river.client.client.FLYS;
+import org.dive4elements.river.client.shared.model.RiverInfo;
 
 /**
  * A Panel to show info about the MeasurementStations of a river
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationRecord.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/stationinfo/MeasurementStationRecord.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,12 +1,12 @@
-package de.intevation.flys.client.client.ui.stationinfo;
+package org.dive4elements.river.client.client.ui.stationinfo;
 
 import java.util.Date;
 
 import com.google.gwt.core.client.GWT;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 
-import de.intevation.flys.client.client.FLYSConstants;
-import de.intevation.flys.client.shared.model.MeasurementStation;
+import org.dive4elements.river.client.client.FLYSConstants;
+import org.dive4elements.river.client.shared.model.MeasurementStation;
 
 /**
  * @author <a href="mailto:bjoern.ricks@intevation.de">Björn Ricks</a>
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/ClickableQDTable.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/ClickableQDTable.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.wq;
+package org.dive4elements.river.client.client.ui.wq;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -11,7 +11,7 @@
 import com.smartgwt.client.widgets.grid.events.CellClickEvent;
 import com.smartgwt.client.widgets.grid.events.CellClickHandler;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/ClickableWTable.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/ClickableWTable.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.wq;
+package org.dive4elements.river.client.client.ui.wq;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -12,7 +12,7 @@
 import com.smartgwt.client.widgets.grid.events.CellClickEvent;
 import com.smartgwt.client.widgets.grid.events.CellClickHandler;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 public class ClickableWTable extends ListGrid {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/QDTable.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/QDTable.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.wq;
+package org.dive4elements.river.client.client.ui.wq;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -10,7 +10,7 @@
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/WQAutoTabSet.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/WQAutoTabSet.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.wq;
+package org.dive4elements.river.client.client.ui.wq;
 
 import com.google.gwt.core.client.GWT;
 
@@ -8,15 +8,15 @@
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-import de.intevation.flys.client.client.services.WQInfoService;
-import de.intevation.flys.client.client.services.WQInfoServiceAsync;
+import org.dive4elements.river.client.client.services.WQInfoService;
+import org.dive4elements.river.client.client.services.WQInfoServiceAsync;
 
-import de.intevation.flys.client.shared.model.WQInfoObject;
-import de.intevation.flys.client.shared.model.WQInfoRecord;
+import org.dive4elements.river.client.shared.model.WQInfoObject;
+import org.dive4elements.river.client.shared.model.WQInfoRecord;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
-import de.intevation.flys.client.client.Config;
+import org.dive4elements.river.client.client.Config;
 
 /** Tabset showing non-selectable W and Q/D values for a gauge. */
 public class WQAutoTabSet extends TabSet {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/WTable.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/ui/wq/WTable.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.ui.wq;
+package org.dive4elements.river.client.client.ui.wq;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -10,7 +10,7 @@
 import com.smartgwt.client.widgets.grid.ListGridField;
 import com.smartgwt.client.widgets.grid.ListGridRecord;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/utils/DoubleValidator.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/utils/DoubleValidator.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.utils;
+package org.dive4elements.river.client.client.utils;
 
 import java.util.Map;
 
@@ -7,7 +7,7 @@
 
 import com.smartgwt.client.widgets.form.fields.FormItem;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 /**
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/utils/EnableDisableCmd.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/utils/EnableDisableCmd.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.utils;
+package org.dive4elements.river.client.client.utils;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/utils/IntegerValidator.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/utils/IntegerValidator.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.utils;
+package org.dive4elements.river.client.client.utils;
 
 import java.util.Map;
 
@@ -6,7 +6,7 @@
 
 import com.smartgwt.client.widgets.form.fields.FormItem;
 
-import de.intevation.flys.client.client.FLYSConstants;
+import org.dive4elements.river.client.client.FLYSConstants;
 
 /**
  * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/utils/Validator.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/utils/Validator.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.utils;
+package org.dive4elements.river.client.client.utils;
 
 import java.util.Map;
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/widgets/DischargeTablesChart.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/widgets/DischargeTablesChart.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.widgets;
+package org.dive4elements.river.client.client.widgets;
 
 import com.google.gwt.core.client.GWT;
 import com.smartgwt.client.widgets.Canvas;
@@ -6,8 +6,8 @@
 import com.smartgwt.client.widgets.events.ResizedEvent;
 import com.smartgwt.client.widgets.events.ResizedHandler;
 
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.ArtifactDescription;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
 
 
 public class DischargeTablesChart extends Canvas implements ResizedHandler {
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinner.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinner.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.client.widgets;
+package org.dive4elements.river.client.client.widgets;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -18,7 +18,7 @@
 import com.smartgwt.client.widgets.form.fields.events.KeyPressHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
-import de.intevation.flys.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.FacetRecord;
 
 import java.util.ArrayList;
 import java.util.List;
--- a/flys-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinnerChangeListener.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/client/widgets/KMSpinnerChangeListener.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,8 +1,8 @@
-package de.intevation.flys.client.client.widgets;
+package org.dive4elements.river.client.client.widgets;
 
-import de.intevation.flys.client.client.widgets.KMSpinner;
+import org.dive4elements.river.client.client.widgets.KMSpinner;
 
-import de.intevation.flys.client.shared.model.FacetRecord;
+import org.dive4elements.river.client.shared.model.FacetRecord;
 
 public interface KMSpinnerChangeListener {
     public void spinnerValueEntered(KMSpinner spinner, double km, FacetRecord facetRecord, boolean up);
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/AddArtifactServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/AddArtifactServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,11 +1,11 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.apache.log4j.Logger;
 
-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.client.services.AddArtifactService;
+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.client.services.AddArtifactService;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/AdvanceServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/AdvanceServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 
@@ -6,18 +6,18 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.client.services.AdvanceService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.client.services.AdvanceService;
 
 
 /**
@@ -57,7 +57,7 @@
 
         try {
             Document description = (Document) client.advance(
-                new de.intevation.artifacts.httpclient.objects.Artifact(
+                new org.dive4elements.artifacts.httpclient.objects.Artifact(
                     artifact.getUuid(),
                     artifact.getHash()),
                 advance,
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactDescriptionFactory.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactDescriptionFactory.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,26 +12,26 @@
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.flys.client.shared.model.ArtifactDescription;
-import de.intevation.flys.client.shared.model.DataItem;
-import de.intevation.flys.client.shared.model.DataList;
-import de.intevation.flys.client.shared.model.DefaultArtifactDescription;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
-import de.intevation.flys.client.shared.model.DefaultOutputMode;
-import de.intevation.flys.client.shared.model.DoubleArrayData;
-import de.intevation.flys.client.shared.model.DoubleRangeData;
-import de.intevation.flys.client.shared.model.IntegerArrayData;
-import de.intevation.flys.client.shared.model.IntegerRangeData;
-import de.intevation.flys.client.shared.model.IntegerOptionsData;
-import de.intevation.flys.client.shared.model.LongRangeData;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.WQDataItem;
+import org.dive4elements.river.client.shared.model.ArtifactDescription;
+import org.dive4elements.river.client.shared.model.DataItem;
+import org.dive4elements.river.client.shared.model.DataList;
+import org.dive4elements.river.client.shared.model.DefaultArtifactDescription;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.DefaultDataItem;
+import org.dive4elements.river.client.shared.model.DefaultOutputMode;
+import org.dive4elements.river.client.shared.model.DoubleArrayData;
+import org.dive4elements.river.client.shared.model.DoubleRangeData;
+import org.dive4elements.river.client.shared.model.IntegerArrayData;
+import org.dive4elements.river.client.shared.model.IntegerRangeData;
+import org.dive4elements.river.client.shared.model.IntegerOptionsData;
+import org.dive4elements.river.client.shared.model.LongRangeData;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.WQDataItem;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactHelper.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactHelper.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -9,19 +9,19 @@
 import java.util.List;
 import java.util.Map;
 
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
-import de.intevation.artifacts.common.utils.CreationFilter;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.CreationFilter;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.utils.ArtifactNamespaceContext;
-import de.intevation.artifacts.httpclient.utils.XMLUtils;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.utils.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.httpclient.utils.XMLUtils;
 
-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;
 
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Recommendation;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/ArtifactServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,15 +1,15 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.apache.log4j.Logger;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.client.services.ArtifactService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.client.services.ArtifactService;
 
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Collection;
+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/server/BaseServletContextListener.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/BaseServletContextListener.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.io.IOException;
 
@@ -8,9 +8,9 @@
 
 import org.apache.log4j.Logger;
 
-import de.intevation.flys.client.server.LoggingConfigurator;
-import de.intevation.flys.client.server.features.Features;
-import de.intevation.flys.client.server.features.XMLFileFeatures;
+import org.dive4elements.river.client.server.LoggingConfigurator;
+import org.dive4elements.river.client.server.features.Features;
+import org.dive4elements.river.client.server.features.XMLFileFeatures;
 
 /**
  * ServletContextListenter to initalize the Features globally for
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/BedKMChartServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/BedKMChartServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,11 +13,11 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import de.intevation.artifacts.common.utils.XMLUtils;
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.StreamResponseHandler;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.StreamResponseHandler;
 
 public class BedKMChartServiceImpl extends HttpServlet {
     private static final Logger log =
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/BedloadKMChartServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/BedloadKMChartServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,11 +13,11 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import de.intevation.artifacts.common.utils.XMLUtils;
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.StreamResponseHandler;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.StreamResponseHandler;
 
 public class BedloadKMChartServiceImpl extends HttpServlet {
    private static final Logger log =
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/CSVExportServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/CSVExportServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,14 +17,14 @@
 
 import au.com.bytecode.opencsv.CSVReader;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.client.services.CSVExportService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.client.services.CSVExportService;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.io.InputStream;
 import java.io.IOException;
@@ -19,12 +19,12 @@
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Capabilities;
-import de.intevation.flys.client.shared.model.ContactInformation;
-import de.intevation.flys.client.shared.model.WMSLayer;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Capabilities;
+import org.dive4elements.river.client.shared.model.ContactInformation;
+import org.dive4elements.river.client.shared.model.WMSLayer;
 
 
 public class CapabilitiesParser {
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/ChartInfoServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/ChartInfoServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.io.InputStream;
 import java.io.IOException;
@@ -17,22 +17,22 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
-import de.intevation.artifacts.common.utils.XMLUtils;
-
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.flys.client.shared.Transform2D;
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Axis;
-import de.intevation.flys.client.shared.model.DateAxis;
-import de.intevation.flys.client.shared.model.NumberAxis;
-import de.intevation.flys.client.shared.model.ChartInfo;
-import de.intevation.flys.client.shared.model.Collection;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
 
-import de.intevation.flys.client.client.services.ChartInfoService;
+import org.dive4elements.river.client.shared.Transform2D;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Axis;
+import org.dive4elements.river.client.shared.model.DateAxis;
+import org.dive4elements.river.client.shared.model.NumberAxis;
+import org.dive4elements.river.client.shared.model.ChartInfo;
+import org.dive4elements.river.client.shared.model.Collection;
+
+import org.dive4elements.river.client.client.services.ChartInfoService;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/ChartOutputServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/ChartOutputServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.io.OutputStream;
 import java.io.IOException;
@@ -13,10 +13,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
 
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/ChartServiceHelper.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/ChartServiceHelper.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.util.Map;
 
@@ -7,9 +7,9 @@
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.XMLUtils;
-import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/CollectionAttributeServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/CollectionAttributeServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,20 +1,20 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
 
-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;
 
-import de.intevation.flys.client.client.services.CollectionAttributeService;
+import org.dive4elements.river.client.client.services.CollectionAttributeService;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/CollectionHelper.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/CollectionHelper.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -16,43 +16,43 @@
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
-import de.intevation.artifacts.common.utils.XMLUtils;
-import de.intevation.artifacts.common.utils.XMLUtils.ElementCreator;
-
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.shared.model.AttributedTheme;
-import de.intevation.flys.client.shared.model.ChartMode;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItem;
-import de.intevation.flys.client.shared.model.DefaultCollection;
-import de.intevation.flys.client.shared.model.DefaultCollectionItem;
-import de.intevation.flys.client.shared.model.DefaultFacet;
-import de.intevation.flys.client.shared.model.ExportMode;
-import de.intevation.flys.client.shared.model.Facet;
-import de.intevation.flys.client.shared.model.MapMode;
-import de.intevation.flys.client.shared.model.OutputMode;
-import de.intevation.flys.client.shared.model.OverviewMode;
-import de.intevation.flys.client.shared.model.ReportMode;
-import de.intevation.flys.client.shared.model.Recommendation;
-import de.intevation.flys.client.shared.model.Theme;
-import de.intevation.flys.client.shared.model.ThemeList;
-import de.intevation.flys.client.shared.model.Settings;
-import de.intevation.flys.client.shared.model.Property;
-import de.intevation.flys.client.shared.model.PropertyGroup;
-import de.intevation.flys.client.shared.model.PropertySetting;
-import de.intevation.flys.client.shared.model.StringProperty;
-import de.intevation.flys.client.shared.model.DoubleProperty;
-import de.intevation.flys.client.shared.model.IntegerProperty;
-import de.intevation.flys.client.shared.model.BooleanProperty;
-import de.intevation.flys.client.shared.model.OutputSettings;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
+
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.shared.model.AttributedTheme;
+import org.dive4elements.river.client.shared.model.ChartMode;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItem;
+import org.dive4elements.river.client.shared.model.DefaultCollection;
+import org.dive4elements.river.client.shared.model.DefaultCollectionItem;
+import org.dive4elements.river.client.shared.model.DefaultFacet;
+import org.dive4elements.river.client.shared.model.ExportMode;
+import org.dive4elements.river.client.shared.model.Facet;
+import org.dive4elements.river.client.shared.model.MapMode;
+import org.dive4elements.river.client.shared.model.OutputMode;
+import org.dive4elements.river.client.shared.model.OverviewMode;
+import org.dive4elements.river.client.shared.model.ReportMode;
+import org.dive4elements.river.client.shared.model.Recommendation;
+import org.dive4elements.river.client.shared.model.Theme;
+import org.dive4elements.river.client.shared.model.ThemeList;
+import org.dive4elements.river.client.shared.model.Settings;
+import org.dive4elements.river.client.shared.model.Property;
+import org.dive4elements.river.client.shared.model.PropertyGroup;
+import org.dive4elements.river.client.shared.model.PropertySetting;
+import org.dive4elements.river.client.shared.model.StringProperty;
+import org.dive4elements.river.client.shared.model.DoubleProperty;
+import org.dive4elements.river.client.shared.model.IntegerProperty;
+import org.dive4elements.river.client.shared.model.BooleanProperty;
+import org.dive4elements.river.client.shared.model.OutputSettings;
 
 //temporary
 
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/CollectionItemAttributeServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/CollectionItemAttributeServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -8,21 +8,21 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.client.services.CollectionItemAttributeService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.client.services.CollectionItemAttributeService;
 
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.CollectionItemAttribute;
-import de.intevation.flys.client.shared.model.Style;
-import de.intevation.flys.client.shared.model.StyleSetting;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.CollectionItemAttribute;
+import org.dive4elements.river.client.shared.model.Style;
+import org.dive4elements.river.client.shared.model.StyleSetting;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/CreateCollectionServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/CreateCollectionServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 
@@ -6,19 +6,19 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.shared.model.DefaultCollection;
-import de.intevation.flys.client.client.services.CreateCollectionService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.shared.model.DefaultCollection;
+import org.dive4elements.river.client.client.services.CreateCollectionService;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/CrossSectionKMServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/CrossSectionKMServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,15 +14,15 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.client.services.CrossSectionKMService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.client.services.CrossSectionKMService;
 
 /**
  * Interact with not documented service.
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/DataFactory.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/DataFactory.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import javax.xml.xpath.XPathConstants;
 
@@ -7,23 +7,23 @@
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.common.ArtifactNamespaceContext;
-import de.intevation.artifacts.common.utils.XMLUtils;
+import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
+import org.dive4elements.artifacts.common.utils.XMLUtils;
 
-import de.intevation.flys.client.shared.model.Data;
-import de.intevation.flys.client.shared.model.DataItem;
-import de.intevation.flys.client.shared.model.DefaultData;
-import de.intevation.flys.client.shared.model.DefaultDataItem;
-import de.intevation.flys.client.shared.model.DoubleArrayData;
-import de.intevation.flys.client.shared.model.IntegerArrayData;
-import de.intevation.flys.client.shared.model.IntegerData;
-import de.intevation.flys.client.shared.model.IntegerOptionsData;
-import de.intevation.flys.client.shared.model.IntegerRangeData;
-import de.intevation.flys.client.shared.model.StringData;
-import de.intevation.flys.client.shared.model.StringOptionsData;
-import de.intevation.flys.client.shared.model.LongRangeData;
+import org.dive4elements.river.client.shared.model.Data;
+import org.dive4elements.river.client.shared.model.DataItem;
+import org.dive4elements.river.client.shared.model.DefaultData;
+import org.dive4elements.river.client.shared.model.DefaultDataItem;
+import org.dive4elements.river.client.shared.model.DoubleArrayData;
+import org.dive4elements.river.client.shared.model.IntegerArrayData;
+import org.dive4elements.river.client.shared.model.IntegerData;
+import org.dive4elements.river.client.shared.model.IntegerOptionsData;
+import org.dive4elements.river.client.shared.model.IntegerRangeData;
+import org.dive4elements.river.client.shared.model.StringData;
+import org.dive4elements.river.client.shared.model.StringOptionsData;
+import org.dive4elements.river.client.shared.model.LongRangeData;
 
-import de.intevation.flys.client.shared.model.IntDataItem;
+import org.dive4elements.river.client.shared.model.IntDataItem;
 
 /**
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/DeleteCollectionServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/DeleteCollectionServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,14 +1,14 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 
 import org.apache.log4j.Logger;
 
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Collection;
-import de.intevation.flys.client.client.services.DeleteCollectionService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Collection;
+import org.dive4elements.river.client.client.services.DeleteCollectionService;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/DescribeArtifactServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/DescribeArtifactServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 
@@ -6,16 +6,16 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
 
-import de.intevation.flys.client.shared.exceptions.ServerException;
-import de.intevation.flys.client.shared.model.Artifact;
-import de.intevation.flys.client.client.services.DescribeArtifactService;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Artifact;
+import org.dive4elements.river.client.client.services.DescribeArtifactService;
 
 
 /**
@@ -53,7 +53,7 @@
             logger.debug("Start Http request now.");
 
             Document description = (Document) client.describe(
-                new de.intevation.artifacts.httpclient.objects.Artifact(
+                new org.dive4elements.artifacts.httpclient.objects.Artifact(
                     artifact.getUuid(),
                     artifact.getHash()),
                 describe,
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/DescribeCollectionServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/DescribeCollectionServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import org.w3c.dom.Document;
 
@@ -6,17 +6,17 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.common.utils.ClientProtocolUtils;
+import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
 
-import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
-import de.intevation.artifacts.httpclient.http.HttpClient;
-import de.intevation.artifacts.httpclient.http.HttpClientImpl;
-import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
+import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
+import org.dive4elements.artifacts.httpclient.http.HttpClient;
+import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
+import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
 
-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;
 
-import de.intevation.flys.client.client.services.DescribeCollectionService;
+import org.dive4elements.river.client.client.services.DescribeCollectionService;
 
 
 /**
--- a/flys-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoServiceImpl.java	Thu Apr 25 12:31:32 2013 +0200
+++ b/flys-client/src/main/java/org/dive4elements/river/client/server/DischargeInfoServiceImpl.java	Thu Apr 25 13:12:15 2013 +0200
@@ -1,4 +1,4 @@
-package de.intevation.flys.client.server;
+package org.dive4elements.river.client.server;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,17 +11,17 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-import de.intevation.artifacts.common