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 40ce3f8b6..d7d75fb39 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
@@ -83,6 +83,7 @@
 import com.avaloq.tools.ddk.xtext.resource.AbstractCachingResourceDescriptionManager;
 import com.avaloq.tools.ddk.xtext.resource.AbstractResourceDescriptionDelta;
 import com.avaloq.tools.ddk.xtext.resource.DerivedObjectAssociations;
+import com.avaloq.tools.ddk.xtext.resource.EmptyResourceDescriptionImpl;
 import com.avaloq.tools.ddk.xtext.resource.FixedCopiedResourceDescription;
 import com.avaloq.tools.ddk.xtext.resource.IDerivedObjectAssociationsStore;
 import com.avaloq.tools.ddk.xtext.resource.extensions.AbstractResourceDescriptionsData;
diff --git a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/EmptyResourceDescriptionImpl.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/EmptyResourceDescriptionImpl.java
similarity index 93%
rename from com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/EmptyResourceDescriptionImpl.java
rename to com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/EmptyResourceDescriptionImpl.java
index 00493806c..6eade59a8 100644
--- a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/EmptyResourceDescriptionImpl.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/EmptyResourceDescriptionImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.builder;
+package com.avaloq.tools.ddk.xtext.resource;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/ResourceMarkersPostProcessingEvent.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceMarkersPostProcessingEvent.java
similarity index 82%
rename from com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/ResourceMarkersPostProcessingEvent.java
rename to com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceMarkersPostProcessingEvent.java
index 05b49127d..0e6ff4b72 100644
--- a/com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/tracing/ResourceMarkersPostProcessingEvent.java
+++ b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/tracing/ResourceMarkersPostProcessingEvent.java
@@ -8,13 +8,10 @@
  * Contributors:
  *     Avaloq Group AG - initial API and implementation
  *******************************************************************************/
-package com.avaloq.tools.ddk.xtext.builder.tracing;
-
-import com.avaloq.tools.ddk.xtext.tracing.ResourceEvent;
-
+package com.avaloq.tools.ddk.xtext.tracing;
 
 /**
- * An event representing the post-processing of a resource's markers during the build. This event will have a {@link ResourceValidationEvent} as its parent.
+ * An event representing the post-processing of a resource's markers.
  */
 public class ResourceMarkersPostProcessingEvent extends ResourceEvent {