diff --git a/org.apache.felix.scr/src/main/java/org/apache/felix/scr/GenericActivator.java b/org.apache.felix.scr/src/main/java/org/apache/felix/scr/GenericActivator.java
index 2c22574..03ee4db 100644
--- a/org.apache.felix.scr/src/main/java/org/apache/felix/scr/GenericActivator.java
+++ b/org.apache.felix.scr/src/main/java/org/apache/felix/scr/GenericActivator.java
@@ -25,8 +25,8 @@
 
 import java.io.InputStream;
 
-import org.apache.felix.declarativeservices.scr.KXml2SAXParser;
-import org.apache.felix.declarativeservices.scr.ParseException;
+import org.apache.felix.scr.parser.KXml2SAXParser;
+import org.apache.felix.scr.parser.ParseException;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentException;
diff --git a/org.apache.felix.scr/src/main/java/org/apache/felix/scr/XmlHandler.java b/org.apache.felix.scr/src/main/java/org/apache/felix/scr/XmlHandler.java
index 0f0b81f..8de3703 100644
--- a/org.apache.felix.scr/src/main/java/org/apache/felix/scr/XmlHandler.java
+++ b/org.apache.felix.scr/src/main/java/org/apache/felix/scr/XmlHandler.java
@@ -20,8 +20,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.felix.declarativeservices.scr.KXml2SAXHandler;
-import org.apache.felix.declarativeservices.scr.ParseException;
+import org.apache.felix.scr.parser.KXml2SAXHandler;
+import org.apache.felix.scr.parser.ParseException;
 
 /**
  * 
diff --git a/org.apache.felix.scr/src/main/java/org/apache/felix/declarativeservices/scr/KXml2SAXHandler.java b/org.apache.felix.scr/src/main/java/org/apache/felix/scr/parser/KXml2SAXHandler.java
similarity index 100%
rename from org.apache.felix.scr/src/main/java/org/apache/felix/declarativeservices/scr/KXml2SAXHandler.java
rename to org.apache.felix.scr/src/main/java/org/apache/felix/scr/parser/KXml2SAXHandler.java
diff --git a/org.apache.felix.scr/src/main/java/org/apache/felix/declarativeservices/scr/KXml2SAXParser.java b/org.apache.felix.scr/src/main/java/org/apache/felix/scr/parser/KXml2SAXParser.java
similarity index 100%
rename from org.apache.felix.scr/src/main/java/org/apache/felix/declarativeservices/scr/KXml2SAXParser.java
rename to org.apache.felix.scr/src/main/java/org/apache/felix/scr/parser/KXml2SAXParser.java
diff --git a/org.apache.felix.scr/src/main/java/org/apache/felix/declarativeservices/scr/ParseException.java b/org.apache.felix.scr/src/main/java/org/apache/felix/scr/parser/ParseException.java
similarity index 100%
rename from org.apache.felix.scr/src/main/java/org/apache/felix/declarativeservices/scr/ParseException.java
rename to org.apache.felix.scr/src/main/java/org/apache/felix/scr/parser/ParseException.java