diff --git a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
index 6a259633e..da8725f1d 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk.check.runtime.core/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.xtext,
  org.eclipse.xtext.xbase.lib,
  org.apache.commons.lang,
- com.avaloq.tools.ddk.xtext
+ com.avaloq.tools.ddk.xtext,
+ com.avaloq.tools.ddk
 Export-Package: com.avaloq.tools.ddk.check.runtime,
  com.avaloq.tools.ddk.check.runtime.configuration,
  com.avaloq.tools.ddk.check.runtime.context,
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java
index 6ecac492f..698514f58 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/AbstractDispatchingCheckImpl.java
@@ -22,7 +22,7 @@
 import org.eclipse.xtext.validation.CheckType;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.google.inject.Inject;
 
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java
index 0b43704a1..6928a3406 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DefaultCheckImpl.java
@@ -27,7 +27,7 @@
 import org.eclipse.xtext.validation.Check;
 import org.eclipse.xtext.validation.CheckMode;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
diff --git a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java
index 261422513..fc0a59997 100644
--- a/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java
+++ b/com.avaloq.tools.ddk.check.runtime.core/src/com/avaloq/tools/ddk/check/runtime/issue/DispatchingCheckImpl.java
@@ -22,7 +22,7 @@
 import org.eclipse.xtext.validation.CheckType;
 import org.eclipse.xtext.validation.ValidationMessageAcceptor;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent.Collector;
 import com.google.inject.Inject;
diff --git a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java
index d7d75fb39..9191ca389 100644
--- a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java
+++ b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java
@@ -65,6 +65,7 @@
 import org.eclipse.xtext.util.Tuples;
 
 import com.avaloq.tools.ddk.caching.CacheManager;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.build.BuildPhases;
 import com.avaloq.tools.ddk.xtext.builder.layered.IXtextBuildTrigger;
 import com.avaloq.tools.ddk.xtext.builder.tracing.BuildFlushEvent;
@@ -94,7 +95,6 @@
 import com.avaloq.tools.ddk.xtext.resource.extensions.ResourceDescriptions2;
 import com.avaloq.tools.ddk.xtext.resource.persistence.DirectLinkingResourceStorageFacade;
 import com.avaloq.tools.ddk.xtext.scoping.ImplicitReferencesAdapter;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.avaloq.tools.ddk.xtext.util.EmfResourceSetUtil;
 import com.avaloq.tools.ddk.xtext.util.ThrowableUtil;
diff --git a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java
index 22db76f0b..95934adcc 100644
--- a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java
+++ b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/resourceloader/ParallelResourceLoader.java
@@ -39,11 +39,11 @@
 import org.eclipse.xtext.util.Triple;
 import org.eclipse.xtext.util.Tuples;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.build.BuildPhases;
 import com.avaloq.tools.ddk.xtext.builder.tracing.LoaderDequeueEvent;
 import com.avaloq.tools.ddk.xtext.builder.tracing.ResourceLoadEvent;
 import com.avaloq.tools.ddk.xtext.linking.ILazyLinkingResource2;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.util.EmfResourceSetUtil;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
diff --git a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java
index 439bb87bb..31d9fb75c 100644
--- a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java
+++ b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/BuildPhaseEvent.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.builder.tracing;
 
-import com.avaloq.tools.ddk.xtext.tracing.TraceEvent;
+import com.avaloq.tools.ddk.tracing.TraceEvent;
 
 
 /**
diff --git a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java
index a1f6fe426..741d65884 100644
--- a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java
+++ b/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/LoaderDequeueEvent.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.avaloq.tools.ddk.xtext.builder.tracing;
 
-import com.avaloq.tools.ddk.xtext.tracing.TraceEvent;
+import com.avaloq.tools.ddk.tracing.TraceEvent;
 
 
 /**
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
index 63451febe..00c4744c9 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/linking/LazyLinkingResource2.java
@@ -39,13 +39,13 @@
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.Triple;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.build.BuildPhases;
 import com.avaloq.tools.ddk.xtext.parser.IResourceAwareParser;
 import com.avaloq.tools.ddk.xtext.resource.IResourceSetServiceCache;
 import com.avaloq.tools.ddk.xtext.resource.ResourceSetOptions;
 import com.avaloq.tools.ddk.xtext.resource.ServiceCacheAdapter;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceInferenceEvent;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java
index 2cbe32364..4b09675bb 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/naming/QualifiedNameConverter.java
@@ -31,7 +31,7 @@ public QualifiedName toQualifiedName(final String qualifiedNameAsString) {
     if (Strings.isEmpty(qualifiedNameAsString)) {
       return super.toQualifiedName(qualifiedNameAsString);
     }
-    List<String> segs = com.avaloq.tools.ddk.xtext.util.Strings.split(qualifiedNameAsString, '.');
+    List<String> segs = com.avaloq.tools.ddk.util.Strings.split(qualifiedNameAsString, '.');
     return QualifiedName.create(segs);
   }
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageFacade.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageFacade.java
index 04de3b7f8..f223ead54 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageFacade.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageFacade.java
@@ -22,9 +22,9 @@
 import org.eclipse.xtext.resource.persistence.ResourceStorageWritable;
 import org.eclipse.xtext.resource.persistence.StorageAwareResource;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Constituent;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Instruction;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 
@@ -35,7 +35,7 @@
  */
 public class DirectLinkingResourceStorageFacade extends ResourceStorageFacade {
 
-  public static final String STORE_NODE_MODEL = "com.avaloq.tools.ddk.xtext.resource.persistence.DirectLinkingResourceStorageFacade.STORE_NODE_MODEL";
+  public static final String STORE_NODE_MODEL = "com.avaloq.tools.ddk.xtext.resource.persistence.DirectLinkingResourceStorageFacade.STORE_NODE_MODEL"; //$NON-NLS-1$
 
   @Inject(optional = true)
   @Named(value = STORE_NODE_MODEL)
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
index abd155490..fe43764b2 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/DirectLinkingResourceStorageLoadable.java
@@ -38,11 +38,11 @@
 import org.eclipse.xtext.resource.persistence.ResourceStorageLoadable;
 import org.eclipse.xtext.resource.persistence.StorageAwareResource;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.modelinference.InferredModelAssociator;
 import com.avaloq.tools.ddk.xtext.resource.ResourceSetOptions;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Constituent;
 import com.avaloq.tools.ddk.xtext.resource.persistence.ResourceLoadMode.Instruction;
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceLoadStorageEvent;
 import com.google.common.base.Ascii;
 import com.google.common.io.CharStreams;
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceEvent.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceEvent.java
index aa78b9d74..60617b7ca 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceEvent.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceEvent.java
@@ -12,6 +12,8 @@
 
 import org.eclipse.emf.common.util.URI;
 
+import com.avaloq.tools.ddk.tracing.TraceEvent;
+
 
 /**
  * An event representing an operation on a resource.
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceValidationRuleSummaryEvent.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceValidationRuleSummaryEvent.java
index bcc76664d..51050c463 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceValidationRuleSummaryEvent.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceValidationRuleSummaryEvent.java
@@ -16,6 +16,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.google.common.collect.Maps;
 
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ForgivingPolymorphicDispatcher.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ForgivingPolymorphicDispatcher.java
deleted file mode 100644
index 13ae70f1c..000000000
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/ForgivingPolymorphicDispatcher.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Avaloq Group AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Avaloq Group AG - initial API and implementation
- *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.util;
-
-import java.util.Collections;
-
-import org.eclipse.xtext.util.PolymorphicDispatcher;
-
-
-/**
- * A {@link PolymorphicDispatcher} for a fixed number of arguments (default is one). "Forgives" missing methods by returning
- * a default value when the method is not found. The default default value is "null".
- * {@link ForgivingPolymorphicDispatcher#ForgivingSingleParameterPolymorphicDispatcher(String, Object)}
- *
- * @param <T>
- *          type this dispatcher works on
- */
-public class ForgivingPolymorphicDispatcher<T> extends PolymorphicDispatcher<T> {
-  private final T returnValue;
-
-  public ForgivingPolymorphicDispatcher(final String methodName, final Object target) {
-    this(methodName, target, null);
-  }
-
-  public ForgivingPolymorphicDispatcher(final String methodName, final Object target, final int parameterCount) {
-    this(methodName, target, parameterCount, null);
-  }
-
-  public ForgivingPolymorphicDispatcher(final String methodName, final Object target, final T returnValue) {
-    this(methodName, target, 1, returnValue);
-  }
-
-  public ForgivingPolymorphicDispatcher(final String methodName, final Object target, final int parameterCount, final T returnValue) {
-    super(methodName, parameterCount, parameterCount, Collections.singletonList(target), PolymorphicDispatcher.NullErrorHandler.<T> get());
-    this.returnValue = returnValue;
-  }
-
-  @Override
-  protected T handleNoSuchMethod(final Object... params) {
-    return returnValue;
-  }
-}
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/StringPool.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/StringPool.java
deleted file mode 100644
index 8e0a2cc46..000000000
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/StringPool.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Avaloq Group AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Avaloq Group AG - initial API and implementation
- *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.util;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-
-/**
- * String pool which is used to avoid duplication of many equal strings.
- */
-public class StringPool {
-
-  private final Map<String, String> pool;
-
-  public StringPool(final boolean useWeakReferences) {
-    pool = useWeakReferences ? new WeakHashMap<String, String>() : new HashMap<String, String>();
-  }
-
-  /**
-   * Retrieves the pooled string corresponding to the given string. If it doesn't already exist in the pool it is automatically added.
-   * 
-   * @param s
-   *          string to get pooled string instance for
-   * @return given string itself (if not already pooled)
-   */
-  public String get(final String s) {
-    final String result = pool.get(s);
-    if (result != null) {
-      return result;
-    }
-    pool.put(s, s);
-    return s;
-  }
-}
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/URIUtil.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/URIUtil.java
deleted file mode 100644
index 39a6563d6..000000000
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/URIUtil.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Avaloq Group AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Avaloq Group AG - initial API and implementation
- *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-
-
-/**
- * Various utility methods for URIs.
- */
-public final class URIUtil {
-
-  /**
-   * Private constructor for utility classes.
-   */
-  private URIUtil() {
-  }
-
-  /**
-   * Gets the workspace file corresponding to the given URI. Returns null if
-   * not available -- for instance when called from a workflow
-   * fragment (the workbench is closed.)
-   *
-   * @param uri
-   *          the uri
-   * @return the workspace file
-   */
-  public static IFile getWorkspaceFile(final URI uri) {
-    return ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(uri.toPlatformString(true)));
-  }
-
-}
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java
index a325e587c..ca3e47313 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/validation/AbstractDeclarativeValidValidator.java
@@ -19,7 +19,7 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.validation.AbstractDeclarativeValidator;
 
-import com.avaloq.tools.ddk.xtext.tracing.ITraceSet;
+import com.avaloq.tools.ddk.tracing.ITraceSet;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent;
 import com.avaloq.tools.ddk.xtext.tracing.ResourceValidationRuleSummaryEvent.Collector;
 import com.google.common.base.Strings;
diff --git a/com.avaloq.tools.ddk/META-INF/MANIFEST.MF b/com.avaloq.tools.ddk/META-INF/MANIFEST.MF
index 4846c2946..09a701c57 100644
--- a/com.avaloq.tools.ddk/META-INF/MANIFEST.MF
+++ b/com.avaloq.tools.ddk/META-INF/MANIFEST.MF
@@ -10,8 +10,12 @@ Require-Bundle: com.google.guava,
  org.apache.commons.lang,
  org.eclipse.jdt.annotation,
  org.eclipse.core.resources,
- org.eclipse.core.runtime
-Export-Package: com.avaloq.tools.ddk.caching
+ org.eclipse.core.runtime,
+ com.google.inject
+Export-Package: com.avaloq.tools.ddk.annotations,
+ com.avaloq.tools.ddk.caching,
+ com.avaloq.tools.ddk.util,
+ com.avaloq.tools.ddk.tracing
 Import-Package: org.apache.logging.log4j,org.apache.log4j
 Automatic-Module-Name: com.avaloq.tools.ddk
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/annotations/SuppressFBWarnings.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/annotations/SuppressFBWarnings.java
similarity index 100%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/annotations/SuppressFBWarnings.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/annotations/SuppressFBWarnings.java
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/FullGarbageCollectionEvent.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/FullGarbageCollectionEvent.java
similarity index 93%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/FullGarbageCollectionEvent.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/FullGarbageCollectionEvent.java
index 91c84db9e..a9645531c 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/FullGarbageCollectionEvent.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/FullGarbageCollectionEvent.java
@@ -9,7 +9,7 @@
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
 
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Arrays;
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ITraceSet.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/ITraceSet.java
similarity index 96%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ITraceSet.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/ITraceSet.java
index edfa77ca7..a0cab6c61 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ITraceSet.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/ITraceSet.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.function.Supplier;
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/MinorGarbageCollectionEvent.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/MinorGarbageCollectionEvent.java
similarity index 93%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/MinorGarbageCollectionEvent.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/MinorGarbageCollectionEvent.java
index 3c26e22e0..5e7ed8efa 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/MinorGarbageCollectionEvent.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/MinorGarbageCollectionEvent.java
@@ -9,7 +9,7 @@
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
 
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Arrays;
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/NullTraceSet.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/NullTraceSet.java
similarity index 93%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/NullTraceSet.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/NullTraceSet.java
index f61eba96f..f92126645 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/NullTraceSet.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/NullTraceSet.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.function.Supplier;
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceConfiguration.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceConfiguration.java
similarity index 95%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceConfiguration.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceConfiguration.java
index 9a8c5a1ff..7c61ec24c 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceConfiguration.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceConfiguration.java
@@ -9,7 +9,7 @@
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
 
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Map;
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceEvent.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceEvent.java
similarity index 95%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceEvent.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceEvent.java
index 869791fd9..05a006b9c 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceEvent.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceEvent.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.util.Arrays;
 
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceSet.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceSet.java
similarity index 96%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceSet.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceSet.java
index a12ad561b..740ed1ab6 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/TraceSet.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/TraceSet.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -18,7 +18,7 @@
 import java.util.function.Supplier;
 
 import com.avaloq.tools.ddk.annotations.SuppressFBWarnings;
-import com.avaloq.tools.ddk.xtext.tracing.TraceEvent.Trigger;
+import com.avaloq.tools.ddk.tracing.TraceEvent.Trigger;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import com.google.common.eventbus.AsyncEventBus;
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/VirtualMachineTracer.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/VirtualMachineTracer.java
similarity index 96%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/VirtualMachineTracer.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/VirtualMachineTracer.java
index 7bee2b872..2813bf4a9 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/VirtualMachineTracer.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/tracing/VirtualMachineTracer.java
@@ -9,7 +9,7 @@
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
 
-package com.avaloq.tools.ddk.xtext.tracing;
+package com.avaloq.tools.ddk.tracing;
 
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/Strings.java b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/util/Strings.java
similarity index 96%
rename from com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/Strings.java
rename to com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/util/Strings.java
index 726b9f630..10150020d 100644
--- a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/util/Strings.java
+++ b/com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/util/Strings.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.util;
+package com.avaloq.tools.ddk.util;
 
 import java.util.ArrayList;
 import java.util.List;