diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/QueryDefinition.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/QueryDefinition.java
index f9864132530..5f6548e13c9 100644
--- a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/QueryDefinition.java
+++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/QueryDefinition.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import com.sap.sse.datamining.components.AggregatorType;
-import com.sap.sse.datamining.components.GrouperType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.GrouperType;
 
 public interface QueryDefinition extends Serializable {
 
diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/StatisticType.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/StatisticType.java
index 27390bfb28a..04b91a9cd42 100644
--- a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/StatisticType.java
+++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/StatisticType.java
@@ -1,8 +1,8 @@
 package com.sap.sailing.datamining.shared;
 
-import com.sap.sse.datamining.components.ElementType;
 import com.sap.sse.datamining.shared.Message;
 import com.sap.sse.datamining.shared.Unit;
+import com.sap.sse.datamining.shared.components.ElementType;
 
 public enum StatisticType {
 
diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
index 724dac89a8e..5547f158e17 100644
--- a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
+++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
@@ -10,8 +10,8 @@ import com.sap.sailing.datamining.shared.DataTypes;
 import com.sap.sailing.datamining.shared.DimensionIdentifier;
 import com.sap.sailing.datamining.shared.QueryDefinition;
 import com.sap.sailing.datamining.shared.StatisticType;
-import com.sap.sse.datamining.components.AggregatorType;
-import com.sap.sse.datamining.components.GrouperType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.GrouperType;
 
 public class SimpleQueryDefinition implements QueryDefinition {
     private static final long serialVersionUID = 8408302866342877839L;
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/GPSFixWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/GPSFixWithContext.java
index 9a729c5c8b0..9eff07bbd22 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/GPSFixWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/GPSFixWithContext.java
@@ -3,7 +3,7 @@ package com.sap.sailing.datamining.data;
 import com.sap.sailing.datamining.WindStrengthCluster;
 import com.sap.sailing.domain.common.LegType;
 import com.sap.sailing.domain.tracking.GPSFixMoving;
-import com.sap.sse.datamining.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.Dimension;
 
 public interface GPSFixWithContext extends GPSFixMoving {
     
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/TrackedLegOfCompetitorWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/TrackedLegOfCompetitorWithContext.java
index 88e84d916e5..8499ce8d244 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/TrackedLegOfCompetitorWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/TrackedLegOfCompetitorWithContext.java
@@ -3,9 +3,9 @@ package com.sap.sailing.datamining.data;
 import com.sap.sailing.datamining.WindStrengthCluster;
 import com.sap.sailing.domain.common.Distance;
 import com.sap.sailing.domain.common.LegType;
-import com.sap.sse.datamining.annotations.Dimension;
-import com.sap.sse.datamining.annotations.SideEffectFreeValue;
 import com.sap.sse.datamining.shared.Unit;
+import com.sap.sse.datamining.shared.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
 
 public interface TrackedLegOfCompetitorWithContext {
     
diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
index b23d6c67870..a737234f455 100755
--- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
@@ -41,7 +41,6 @@
 <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.geocoding/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.server.replication/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.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.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.gwt/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.google.gwt.osgi/lib/gwt-user.jar&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 id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.sap.sailing.gwt.ui&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java
index a76b4235e96..a1c9bbd7262 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningEntryPoint.java
@@ -31,8 +31,8 @@ import com.sap.sailing.gwt.ui.datamining.presentation.ResultsChart;
 import com.sap.sailing.gwt.ui.datamining.selection.QueryDefinitionProviderWithControls;
 import com.sap.sailing.gwt.ui.datamining.settings.QueryRunnerSettings;
 import com.sap.sailing.gwt.ui.datamining.settings.RefreshingSelectionTablesSettings;
-import com.sap.sse.datamining.components.AggregatorType;
-import com.sap.sse.datamining.components.GrouperType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.GrouperType;
 
 public class DataMiningEntryPoint extends AbstractEntryPoint {
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java
index b5a4e03c22b..5564ffdf796 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/GroupingProvider.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 import com.sap.sailing.datamining.shared.QueryDefinition;
 import com.sap.sailing.datamining.shared.DimensionIdentifier;
 import com.sap.sailing.gwt.ui.client.shared.components.Component;
-import com.sap.sse.datamining.components.GrouperType;
+import com.sap.sse.datamining.shared.components.GrouperType;
 
 public interface GroupingProvider extends Component<Object> {
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java
index fe6b4634a5a..1ff5a5d4756 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/StatisticProvider.java
@@ -5,7 +5,7 @@ import com.sap.sailing.datamining.shared.QueryDefinition;
 import com.sap.sailing.datamining.shared.StatisticType;
 import com.sap.sailing.gwt.ui.client.shared.components.Component;
 import com.sap.sailing.gwt.ui.datamining.selection.SimpleStatistic;
-import com.sap.sse.datamining.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
 
 public interface StatisticProvider extends Component<Object> {
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/AbstractQueryDefinitionProvider.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/AbstractQueryDefinitionProvider.java
index 118a5bb79d7..cf1778db37e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/AbstractQueryDefinitionProvider.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/AbstractQueryDefinitionProvider.java
@@ -12,7 +12,7 @@ import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.datamining.QueryDefinitionChangedListener;
 import com.sap.sailing.gwt.ui.datamining.QueryDefinitionProvider;
-import com.sap.sse.datamining.components.GrouperType;
+import com.sap.sse.datamining.shared.components.GrouperType;
 
 public abstract class AbstractQueryDefinitionProvider implements QueryDefinitionProvider {
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatistic.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatistic.java
index f04f49ed044..74033e00013 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatistic.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatistic.java
@@ -6,7 +6,7 @@ import java.util.Set;
 
 import com.sap.sailing.datamining.shared.DataTypes;
 import com.sap.sailing.datamining.shared.StatisticType;
-import com.sap.sse.datamining.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
 
 public class ComplexStatistic {
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatisticProvider.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatisticProvider.java
index 722f28a6141..13e0fa33975 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatisticProvider.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/ComplexStatisticProvider.java
@@ -19,7 +19,7 @@ import com.sap.sailing.gwt.ui.client.shared.components.SimpleValueListBox;
 import com.sap.sailing.gwt.ui.datamining.StatisticChangedListener;
 import com.sap.sailing.gwt.ui.datamining.StatisticProvider;
 import com.sap.sailing.gwt.ui.datamining.StatisticsManager;
-import com.sap.sse.datamining.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
 
 public class ComplexStatisticProvider implements StatisticProvider {
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/GroupBySelectionPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/GroupBySelectionPanel.java
index 439dfb532bd..bfaa8da6126 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/GroupBySelectionPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/GroupBySelectionPanel.java
@@ -17,7 +17,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.sap.sailing.datamining.shared.DimensionIdentifier;
 import com.sap.sailing.datamining.shared.QueryDefinition;
 import com.sap.sailing.gwt.ui.client.StringMessages;
-import com.sap.sse.datamining.components.GrouperType;
+import com.sap.sse.datamining.shared.components.GrouperType;
 
 public abstract class GroupBySelectionPanel extends FlowPanel {
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RestrictedGroupingProvider.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RestrictedGroupingProvider.java
index 888bcb680d5..166f9fcde3a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RestrictedGroupingProvider.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/RestrictedGroupingProvider.java
@@ -22,7 +22,7 @@ import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent;
 import com.sap.sailing.gwt.ui.client.shared.components.SimpleValueListBox;
 import com.sap.sailing.gwt.ui.datamining.GroupingChangedListener;
 import com.sap.sailing.gwt.ui.datamining.GroupingProvider;
-import com.sap.sse.datamining.components.GrouperType;
+import com.sap.sse.datamining.shared.components.GrouperType;
 
 public class RestrictedGroupingProvider implements GroupingProvider {
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatistic.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatistic.java
index f5b5000975a..283e6cb6897 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatistic.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatistic.java
@@ -2,7 +2,7 @@ package com.sap.sailing.gwt.ui.datamining.selection;
 
 import com.sap.sailing.datamining.shared.DataTypes;
 import com.sap.sailing.datamining.shared.StatisticType;
-import com.sap.sse.datamining.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
 
 public class SimpleStatistic {
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatisticsManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatisticsManager.java
index a40fc080d87..a673a1c3008 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatisticsManager.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/selection/SimpleStatisticsManager.java
@@ -8,7 +8,7 @@ import java.util.Set;
 import com.sap.sailing.datamining.shared.DataTypes;
 import com.sap.sailing.datamining.shared.StatisticType;
 import com.sap.sailing.gwt.ui.datamining.StatisticsManager;
-import com.sap.sse.datamining.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.AggregatorType;
 
 public class SimpleStatisticsManager implements StatisticsManager {
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
index 402dcfb2d7e..c7c0f5d2c78 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
@@ -11,10 +11,10 @@
 
 	<!-- Other module inherits -->
     <inherits name="com.sap.sse.gwt.SSESharedGWT" />
+    <inherits name="com.sap.sse.datamining.DataMiningDomain" />
     <inherits name="com.sap.sailing.gwt.ui.EmulatedJRE" />
 	<inherits name="com.sap.sailing.domain.SailingDomain" />
 	<inherits name="com.sap.sailing.datamining.DataMiningSailingDomain" />
-    <inherits name="com.sap.sse.datamining.DataMiningDomain" />
 
 	<entry-point class="com.sap.sailing.gwt.ui.datamining.DataMiningEntryPoint" />
 	
diff --git a/java/com.sap.sse.datamining.shared/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.shared/META-INF/MANIFEST.MF
index b98513eea3d..9b07d7f70df 100644
--- a/java/com.sap.sse.datamining.shared/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.datamining.shared/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-SymbolicName: com.sap.sse.datamining.shared
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.sap.sse.datamining.annotations,
- com.sap.sse.datamining.components,
- com.sap.sse.datamining.shared,
+Export-Package: com.sap.sse.datamining.shared,
+ com.sap.sse.datamining.shared.annotations,
+ com.sap.sse.datamining.shared.components,
  com.sap.sse.datamining.shared.dto,
  com.sap.sse.datamining.shared.impl,
  com.sap.sse.datamining.shared.impl.dto
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/DataMiningDomain.gwt.xml b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/DataMiningDomain.gwt.xml
index 803fb408a0b..52f0280dff6 100644
--- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/DataMiningDomain.gwt.xml
+++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/DataMiningDomain.gwt.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.4.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.4.0/distro-source/core/src/gwt-module.dtd">
 <module>
   <source path='shared'/>
-  <source path='components'/>
+  <source path='shared/components'/>
   <source path='shared/dto'/>
   <source path='shared/impl'/>
   <source path='shared/impl/dto'/>
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/ElementType.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/ElementType.java
deleted file mode 100644
index 3c5c9f4272e..00000000000
--- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/ElementType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.sap.sse.datamining.components;
-
-public enum ElementType {
-    Integer, Double
-}
\ No newline at end of file
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/GrouperType.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/GrouperType.java
deleted file mode 100644
index fc880aad4c1..00000000000
--- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/GrouperType.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.sap.sse.datamining.components;
-
-public enum GrouperType {
-    Dimensions
-}
\ No newline at end of file
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/annotations/Dimension.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/Dimension.java
similarity index 96%
rename from java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/annotations/Dimension.java
rename to java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/Dimension.java
index 5100b7886f1..f511540f20a 100644
--- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/annotations/Dimension.java
+++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/Dimension.java
@@ -1,4 +1,4 @@
-package com.sap.sse.datamining.annotations;
+package com.sap.sse.datamining.shared.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/annotations/SideEffectFreeValue.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/SideEffectFreeValue.java
similarity index 93%
rename from java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/annotations/SideEffectFreeValue.java
rename to java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/SideEffectFreeValue.java
index 36dc59fe041..40239cbf977 100644
--- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/annotations/SideEffectFreeValue.java
+++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/annotations/SideEffectFreeValue.java
@@ -1,4 +1,4 @@
-package com.sap.sse.datamining.annotations;
+package com.sap.sse.datamining.shared.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/AggregatorType.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/AggregatorType.java
similarity index 90%
rename from java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/AggregatorType.java
rename to java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/AggregatorType.java
index ef8efd0d84b..17bcba2ae3c 100644
--- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/components/AggregatorType.java
+++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/AggregatorType.java
@@ -1,4 +1,4 @@
-package com.sap.sse.datamining.components;
+package com.sap.sse.datamining.shared.components;
 
 import com.sap.sse.datamining.shared.Message;
 
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/ElementType.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/ElementType.java
new file mode 100644
index 00000000000..6c3b49d5ca1
--- /dev/null
+++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/ElementType.java
@@ -0,0 +1,5 @@
+package com.sap.sse.datamining.shared.components;
+
+public enum ElementType {
+    Integer, Double
+}
\ No newline at end of file
diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/GrouperType.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/GrouperType.java
new file mode 100644
index 00000000000..9c8a2bd2dea
--- /dev/null
+++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/components/GrouperType.java
@@ -0,0 +1,5 @@
+package com.sap.sse.datamining.shared.components;
+
+public enum GrouperType {
+    Dimensions
+}
\ No newline at end of file
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/components/util/Number.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/components/util/Number.java
index 28be8eaca72..0cb944c6a38 100644
--- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/components/util/Number.java
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/components/util/Number.java
@@ -1,6 +1,6 @@
 package com.sap.sse.datamining.test.components.util;
 
-import com.sap.sse.datamining.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.Dimension;
 
 /*
  * DON'T CHANGE THE METHOD/CLASS NAMES!
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeInterface.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeInterface.java
index 3216550bafd..f30a8df504d 100644
--- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeInterface.java
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeInterface.java
@@ -1,7 +1,7 @@
 package com.sap.sse.datamining.test.function.test_classes;
 
-import com.sap.sse.datamining.annotations.SideEffectFreeValue;
 import com.sap.sse.datamining.shared.Unit;
+import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
 
 public interface DataTypeInterface {
     
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContext.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContext.java
index fc248540d01..48be7950e1f 100644
--- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContext.java
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContext.java
@@ -1,6 +1,6 @@
 package com.sap.sse.datamining.test.function.test_classes;
 
-import com.sap.sse.datamining.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.Dimension;
 
 /*
  * DON'T CHANGE THE METHOD/CLASS NAMES!
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContextProcessor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContextProcessor.java
index 3355a4bee42..f8fdd19999d 100644
--- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContextProcessor.java
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/DataTypeWithContextProcessor.java
@@ -1,6 +1,6 @@
 package com.sap.sse.datamining.test.function.test_classes;
 
-import com.sap.sse.datamining.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.Dimension;
 
 public class DataTypeWithContextProcessor {
     
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/ExtendingInterface.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/ExtendingInterface.java
index 8b42a5daf19..86a38d5d4a3 100644
--- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/ExtendingInterface.java
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/ExtendingInterface.java
@@ -1,6 +1,6 @@
 package com.sap.sse.datamining.test.function.test_classes;
 
-import com.sap.sse.datamining.annotations.SideEffectFreeValue;
+import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
 
 public interface ExtendingInterface {
 
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/SimpleClassWithMarkedMethods.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/SimpleClassWithMarkedMethods.java
index 2254115500e..6d0f02703d7 100644
--- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/SimpleClassWithMarkedMethods.java
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/function/test_classes/SimpleClassWithMarkedMethods.java
@@ -1,7 +1,7 @@
 package com.sap.sse.datamining.test.function.test_classes;
 
-import com.sap.sse.datamining.annotations.Dimension;
-import com.sap.sse.datamining.annotations.SideEffectFreeValue;
+import com.sap.sse.datamining.shared.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
 
 /*
  * DON'T CHANGE THE METHOD/CLASS NAMES!
diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java
index 05eb43452c0..0695142ab68 100644
--- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java
+++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/AggregatorFactory.java
@@ -3,12 +3,12 @@ package com.sap.sse.datamining.factories;
 import java.util.Locale;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import com.sap.sse.datamining.components.AggregatorType;
 import com.sap.sse.datamining.components.ParallelAggregator;
-import com.sap.sse.datamining.components.ElementType;
 import com.sap.sse.datamining.i18n.DataMiningStringMessages;
 import com.sap.sse.datamining.impl.components.deprecated.GroupDividingParallelAggregator;
 import com.sap.sse.datamining.impl.workers.builders.AggregationWorkerBuilder;
+import com.sap.sse.datamining.shared.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.ElementType;
 import com.sap.sse.datamining.workers.AggregationWorker;
 import com.sap.sse.datamining.workers.WorkerBuilder;
 
diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java
index 2f9d36c9dbf..e21354e9ead 100644
--- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java
+++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java
@@ -3,10 +3,10 @@ package com.sap.sse.datamining.functions;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Locale;
 
-import com.sap.sse.datamining.annotations.Dimension;
-import com.sap.sse.datamining.annotations.SideEffectFreeValue;
 import com.sap.sse.datamining.i18n.DataMiningStringMessages;
 import com.sap.sse.datamining.shared.Unit;
+import com.sap.sse.datamining.shared.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
 import com.sap.sse.datamining.shared.dto.FunctionDTO;
 
 public interface Function<ReturnType> {
diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectDimensionFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectDimensionFilterCriteria.java
index 8e7cf75df89..55b8c58f868 100644
--- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectDimensionFilterCriteria.java
+++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectDimensionFilterCriteria.java
@@ -2,8 +2,8 @@ package com.sap.sse.datamining.impl.functions;
 
 import java.lang.reflect.Method;
 
-import com.sap.sse.datamining.annotations.Dimension;
 import com.sap.sse.datamining.components.FilterCriteria;
+import com.sap.sse.datamining.shared.annotations.Dimension;
 
 public class MethodIsCorrectDimensionFilterCriteria implements FilterCriteria<Method> {
 
diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectSideEffectFreeValueFilterCriteria.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectSideEffectFreeValueFilterCriteria.java
index 4ed53b9c86e..ef6fdb1900b 100644
--- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectSideEffectFreeValueFilterCriteria.java
+++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodIsCorrectSideEffectFreeValueFilterCriteria.java
@@ -2,8 +2,8 @@ package com.sap.sse.datamining.impl.functions;
 
 import java.lang.reflect.Method;
 
-import com.sap.sse.datamining.annotations.SideEffectFreeValue;
 import com.sap.sse.datamining.components.FilterCriteria;
+import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
 
 public class MethodIsCorrectSideEffectFreeValueFilterCriteria implements FilterCriteria<Method> {
 
diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java
index dd9b3ef24a7..8ef5e900fab 100644
--- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java
+++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java
@@ -8,10 +8,10 @@ import java.util.List;
 import java.util.Locale;
 import java.util.logging.Level;
 
-import com.sap.sse.datamining.annotations.Dimension;
-import com.sap.sse.datamining.annotations.SideEffectFreeValue;
 import com.sap.sse.datamining.i18n.DataMiningStringMessages;
 import com.sap.sse.datamining.shared.Unit;
+import com.sap.sse.datamining.shared.annotations.Dimension;
+import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
 import com.sap.sse.datamining.shared.dto.FunctionDTO;
 import com.sap.sse.datamining.shared.impl.dto.FunctionDTOImpl;
 
diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java
index fc22f849654..34efabd469c 100644
--- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java
+++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/workers/builders/AggregationWorkerBuilder.java
@@ -1,7 +1,5 @@
 package com.sap.sse.datamining.impl.workers.builders;
 
-import com.sap.sse.datamining.components.AggregatorType;
-import com.sap.sse.datamining.components.ElementType;
 import com.sap.sse.datamining.impl.workers.aggregators.SimpleDoubleArithmeticAverageAggregationWorker;
 import com.sap.sse.datamining.impl.workers.aggregators.SimpleDoubleMedianAggregationWorker;
 import com.sap.sse.datamining.impl.workers.aggregators.SimpleIntegerArithmeticAverageAggregationWorker;
@@ -9,6 +7,8 @@ import com.sap.sse.datamining.impl.workers.aggregators.SimpleIntegerMedianAggreg
 import com.sap.sse.datamining.impl.workers.aggregators.SumAggregationWorker;
 import com.sap.sse.datamining.impl.workers.aggregators.helpers.SimpleDoubleSumAggregationHelper;
 import com.sap.sse.datamining.impl.workers.aggregators.helpers.SimpleIntegerSumAggregationHelper;
+import com.sap.sse.datamining.shared.components.AggregatorType;
+import com.sap.sse.datamining.shared.components.ElementType;
 import com.sap.sse.datamining.workers.AggregationWorker;
 import com.sap.sse.datamining.workers.WorkerBuilder;