diff --git a/pom.xml b/pom.xml
index dfba091..01cfbf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
       <modules>
         <module>maven-obr-plugin</module>
         <module>bundleplugin</module>
-        <module>scrplugin-annotations</module>
+        <module>scr-annotations</module>
         <module>scrplugin</module>
         <module>tools/maven2/maven-osgi-plugin</module>
 <!--        <module>tools/maven2/maven-felix-plugin</module> -->
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/AutoDetect.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/AutoDetect.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/AutoDetect.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Properties.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/Properties.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/Property.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/PropertyOption.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/PropertyOption.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/Reference.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferenceCardinality.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferencePolicy.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferencePolicy.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/ReferencePolicy.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/References.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/References.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/Service.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Services.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/Services.java
diff --git a/scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/package-info.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java
similarity index 100%
rename from scr-annotations/src/main/java/org/apache/felix/scrplugin/annotations/package-info.java
rename to scr-annotations/src/main/java/org/apache/felix/scr/annotations/package-info.java