diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
index f41f1349905..611a42bb0f5 100755
--- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch	
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch	
@@ -56,8 +56,8 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.sap.sailing.polars.datamining.shared/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.sap.sse.datamining.annotations/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.sap.sailing.expeditionconnector.common/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.sap.sse.datamining.ui/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.sap.sse.datamining.ui/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.sap.sse.datamining.ui/src/main/resources&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.sap.sse.datamining.ui/src/main/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
index aa049ed7772..30c43a6c917 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
@@ -1470,9 +1470,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
     String defaultName();
     String exampleTextForName();
     String flightsCount(@PluralCount(DefaultRule_1_0n.class) int count);
-    String queryDefinitionViewer();
     String resultsFoundForSearch(@PluralCount(DefaultRule_1_0n.class) int amount, String searchText);
-    String useClassGetName();
     String errorLoadingDataWithTryAgain();
     String addGalleryPhoto();
     String addStageImage();
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
index 9c666ad1841..199a3dc95bd 100644
--- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch	
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch	
@@ -36,5 +36,5 @@
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="false"/>
-<stringAttribute key="workspace_bundles" value="com.google.gwt.servlet@default:default,com.googlecode.java-diff-utils@default:default,com.googlecode.mgwt@default:default,com.sap.sailing.barbados.resultimport@default:default,com.sap.sailing.competitorimport@default:default,com.sap.sailing.dashboards.gwt@5:true,com.sap.sailing.datamining.provider@default:default,com.sap.sailing.datamining.shared@default:default,com.sap.sailing.datamining@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.deckmanadapter@4:true,com.sap.sailing.domain.expeditionadapter@4:true,com.sap.sailing.domain.igtimiadapter.persistence@default:default,com.sap.sailing.domain.igtimiadapter@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.racelogtrackingadapter@3:default,com.sap.sailing.domain.shared.android@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@4:true,com.sap.sailing.domain.swisstimingreplayadapter@4:true,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@4:true,com.sap.sailing.domain.windfinderadapter@4:true,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector.common@default:default,com.sap.sailing.expeditionconnector.persistence@3:true,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.grib@default:default,com.sap.sailing.gwt.ui@5:true,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.manage2sail.resultimport@default:default,com.sap.sailing.manage2sail@default:default,com.sap.sailing.monitoring@default:default,com.sap.sailing.news@default:default,com.sap.sailing.nmeaconnector@default:default,com.sap.sailing.polars.datamining.shared@default:default,com.sap.sailing.polars.datamining@default:default,com.sap.sailing.polars@4:true,com.sap.sailing.resultimport@default:default,com.sap.sailing.sailwave.resultimport@default:default,com.sap.sailing.server.gateway.serialization.shared.android@default:default,com.sap.sailing.server.gateway.serialization@default:default,com.sap.sailing.server.gateway@5:true,com.sap.sailing.server.trackfiles@default:default,com.sap.sailing.server@default:default,com.sap.sailing.simulator@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.velum.resultimport@default:default,com.sap.sailing.www@4:true,com.sap.sailing.xrr.resultimport@default:default,com.sap.sailing.xrr.schema@default:default,com.sap.sailing.xrr.structureimport@default:default,com.sap.sailing.yachtscoring.resultimport@default:default,com.sap.sse.common@default:default,com.sap.sse.datamining.annotations@default:default,com.sap.sse.datamining.shared@default:default,com.sap.sse.datamining@default:default,com.sap.sse.filestorage@default:default,com.sap.sse.gwt.adminconsole@default:default,com.sap.sse.gwt@default:default,com.sap.sse.mail@4:true,com.sap.sse.mongodb@default:default,com.sap.sse.operationaltransformation@default:default,com.sap.sse.replication@4:true,com.sap.sse.security.common@default:default,com.sap.sse.security.ui@6:true,com.sap.sse.security.userstore.mongodb@4:true,com.sap.sse.security@5:true,com.sap.sse.shared.android@default:default,com.sap.sse@default:default,com.tractrac.clientmodule@default:default,net.sf.marineapi@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default,org.mp4parser.isoparser@default:default"/>
+<stringAttribute key="workspace_bundles" value="com.google.gwt.servlet@default:default,com.googlecode.java-diff-utils@default:default,com.googlecode.mgwt@default:default,com.sap.sailing.barbados.resultimport@default:default,com.sap.sailing.competitorimport@default:default,com.sap.sailing.dashboards.gwt@5:true,com.sap.sailing.datamining.provider@default:default,com.sap.sailing.datamining.shared@default:default,com.sap.sailing.datamining@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.deckmanadapter@4:true,com.sap.sailing.domain.expeditionadapter@4:true,com.sap.sailing.domain.igtimiadapter.persistence@default:default,com.sap.sailing.domain.igtimiadapter@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.racelogtrackingadapter@3:default,com.sap.sailing.domain.shared.android@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@4:true,com.sap.sailing.domain.swisstimingreplayadapter@4:true,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@4:true,com.sap.sailing.domain.windfinderadapter@4:true,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector.common@default:default,com.sap.sailing.expeditionconnector.persistence@3:true,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.grib@default:default,com.sap.sailing.gwt.ui@5:true,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.manage2sail.resultimport@default:default,com.sap.sailing.manage2sail@default:default,com.sap.sailing.monitoring@default:default,com.sap.sailing.news@default:default,com.sap.sailing.nmeaconnector@default:default,com.sap.sailing.polars.datamining.shared@default:default,com.sap.sailing.polars.datamining@default:default,com.sap.sailing.polars@4:true,com.sap.sailing.resultimport@default:default,com.sap.sailing.sailwave.resultimport@default:default,com.sap.sailing.server.gateway.serialization.shared.android@default:default,com.sap.sailing.server.gateway.serialization@default:default,com.sap.sailing.server.gateway@5:true,com.sap.sailing.server.trackfiles@default:default,com.sap.sailing.server@default:default,com.sap.sailing.simulator@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.velum.resultimport@default:default,com.sap.sailing.www@4:true,com.sap.sailing.xrr.resultimport@default:default,com.sap.sailing.xrr.schema@default:default,com.sap.sailing.xrr.structureimport@default:default,com.sap.sailing.yachtscoring.resultimport@default:default,com.sap.sse.common@default:default,com.sap.sse.datamining.annotations@default:default,com.sap.sse.datamining.shared@default:default,com.sap.sse.datamining.ui@default:default,com.sap.sse.datamining@default:default,com.sap.sse.filestorage@default:default,com.sap.sse.gwt.adminconsole@default:default,com.sap.sse.gwt@default:default,com.sap.sse.mail@4:true,com.sap.sse.mongodb@default:default,com.sap.sse.operationaltransformation@default:default,com.sap.sse.replication@4:true,com.sap.sse.security.common@default:default,com.sap.sse.security.ui@6:true,com.sap.sse.security.userstore.mongodb@4:true,com.sap.sse.security@5:true,com.sap.sse.shared.android@default:default,com.sap.sse@default:default,com.tractrac.clientmodule@default:default,net.sf.marineapi@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default,org.mp4parser.isoparser@default:default"/>
 </launchConfiguration>
diff --git a/java/com.sap.sse.datamining.ui/.classpath b/java/com.sap.sse.datamining.ui/.classpath
index b247c0e698a..46e988fba74 100644
--- a/java/com.sap.sse.datamining.ui/.classpath
+++ b/java/com.sap.sse.datamining.ui/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="resources"/>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/com.sap.sse.datamining.ui/.gitignore b/java/com.sap.sse.datamining.ui/.gitignore
deleted file mode 100644
index ae3c1726048..00000000000
--- a/java/com.sap.sse.datamining.ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin/
diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1c1633b69eb..00000000000
--- a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages.properties=UTF-8
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages_de.properties=UTF-8
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages_es.properties=UTF-8
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties=UTF-8
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties=UTF-8
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties=UTF-8
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties=UTF-8
-encoding//src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties=UTF-8
diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs
index a698e59674f..0c68a61dca8 100644
--- a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/java/com.sap.sse.datamining.ui/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 00000000000..e8ff8be0bab
--- /dev/null
+++ b/java/com.sap.sse.datamining.ui/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF
index 493e4ecaee5..6e9a40d0b25 100644
--- a/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.datamining.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,12 @@ Bundle-SymbolicName: com.sap.sse.datamining.ui
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
+Require-Bundle: com.sap.sse.gwt,
+ com.sap.sse.common,
+ com.sap.sse.datamining.shared,
+ org.moxieapps.gwt.highcharts,
+ com.google.gwt.servlet;bundle-version="2.8.2",
+ com.google.gwt.user;bundle-version="2.8.2";resolution:=optional
 Export-Package: com.sap.sse.datamining.ui.client,
  com.sap.sse.datamining.ui.client.developer,
  com.sap.sse.datamining.ui.client.execution,
@@ -14,8 +19,4 @@ Export-Package: com.sap.sse.datamining.ui.client,
  com.sap.sse.datamining.ui.client.selection,
  com.sap.sse.datamining.ui.client.selection.filter,
  com.sap.sse.datamining.ui.client.settings
-Require-Bundle: com.sap.sse.gwt;bundle-version="1.0.0",
- com.sap.sse.datamining.shared;bundle-version="1.0.0",
- com.sap.sse.common,
- org.moxieapps.gwt.highcharts;bundle-version="1.6.0"
-Automatic-Module-Name: com.sap.sse.datamining.ui
+Bundle-ActivationPolicy: lazy
diff --git a/java/com.sap.sse.datamining.ui/build.properties b/java/com.sap.sse.datamining.ui/build.properties
index 1e6a0fbf26f..cc04202b130 100644
--- a/java/com.sap.sse.datamining.ui/build.properties
+++ b/java/com.sap.sse.datamining.ui/build.properties
@@ -1,5 +1,5 @@
-source.. = src/,\
-           resources/
+source.. = src/main/java/,\
+           src/main/resources/
 output.. = bin/
 bin.includes = META-INF/,\
-
+               .
diff --git a/java/com.sap.sse.datamining.ui/pom.xml b/java/com.sap.sse.datamining.ui/pom.xml
deleted file mode 100644
index 31cd313d40d..00000000000
--- a/java/com.sap.sse.datamining.ui/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>root</artifactId>
-        <groupId>com.sap.sailing</groupId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>com.sap.sse.datamining.ui</artifactId>
-    <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AbstractDataMiningComponent.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionChangedListener.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AggregatorDefinitionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/AnchorDataMiningSettingsControl.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningComponentProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningResources.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningResources.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningResources.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningService.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningService.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningService.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningService.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningServiceAsync.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsControl.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfo.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataMiningSettingsInfoManager.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionChangedListener.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/DataRetrieverChainDefinitionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionChangedListener.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ExtractionFunctionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionChangedListener.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/FilterSelectionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingChangedListener.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingChangedListener.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingChangedListener.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/GroupingProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/GroupingProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ManagedDataMiningQueriesCounter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionChangedListener.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryDefinitionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryRunner.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryRunner.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/QueryRunner.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/QueryRunner.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/ResultsPresenterWithControls.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticChangedListener.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticChangedListener.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticChangedListener.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticChangedListener.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StatisticProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StatisticProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_de.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_de.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_de.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_de.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_es.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_es.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_es.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_es.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_fr.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_fr.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_fr.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ja.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ja.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ja.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_pt.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_pt.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_pt.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ru.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_ru.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_ru.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_zh.properties
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/StringMessages_zh.properties
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/StringMessages_zh.properties
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/WithControls.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/WithControls.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/WithControls.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/WithControls.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/PredefinedQueryRunner.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionParser.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/developer/QueryDefinitionViewer.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/ManagedDataMiningQueryCallback.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleManagedDataMiningQueriesCounter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/execution/SimpleQueryRunner.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractNumericResultsPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractResultsPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/MultiResultsPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainFilterSelectionPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/PlainResultsPresenter.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/ResultsChart.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AbstractNumericDataProviderWithStaticMappings.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/AverageWithStatsDataProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/BearingDataProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DataProvidersPrecedenceList.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DistanceDataProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java
old mode 100755
new mode 100644
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/DurationDataProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/dataproviders/NumberDataProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/AbstractQueryDefinitionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/ExtractionFunctionAndAggregatorDefinitionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/MultiDimensionalGroupingProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/QueryDefinitionProviderWithControls.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/RetrieverLevelSettingsComponent.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SimpleDataRetrieverChainDefinitionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/SuggestBoxStatisticProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ControllableMultiSelectionModel.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/DimensionFilterSelectionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTable.css
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterTableResources.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/FilterableSelectionTable.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/ListRetrieverChainFilterSelectionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/selection/filter/RetrieverLevelFilterSelectionProvider.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettings.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/AdvancedDataMiningSettingsDialogComponent.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettings.java
diff --git a/java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java b/java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java
similarity index 100%
rename from java/com.sap.sse.datamining.ui/src/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java
rename to java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/settings/QueryRunnerSettingsDialogComponent.java
diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml
similarity index 100%
rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml
rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/SSEDataMining.gwt.xml
diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_left.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_left.png
similarity index 100%
rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_left.png
rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_left.png
diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_right.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_right.png
similarity index 100%
rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/arrow_right.png
rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/arrow_right.png
diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/close.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/close.png
similarity index 100%
rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/close.png
rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/close.png
diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/magnifier_small.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/magnifier_small.png
similarity index 100%
rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/magnifier_small.png
rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/magnifier_small.png
diff --git a/java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/plusicon_small.png b/java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/plusicon_small.png
similarity index 100%
rename from java/com.sap.sse.datamining.ui/resources/com/sap/sse/datamining/ui/images/plusicon_small.png
rename to java/com.sap.sse.datamining.ui/src/main/resources/com/sap/sse/datamining/ui/images/plusicon_small.png
diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml
index f454ba6bc60..29bdd11e390 100644
--- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml
+++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/SSESharedGWT.gwt.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.7.0//EN" "http://gwtproject.org/doctype/2.7.0/gwt-module.dtd">
 <module>
+  <!-- required module to provide the sse String Messages -->
+  <inherits name="com.google.gwt.resources.Resources" />
+  
   <inherits name="com.google.gwt.activity.Activity" />
   <inherits name="com.sap.sse.common.SSECommonSerializers" />
   <source path='client'/>