diff --git a/scrplugin/LICENSE b/scrplugin/maven-scr-plugin/LICENSE
similarity index 100%
rename from scrplugin/LICENSE
rename to scrplugin/maven-scr-plugin/LICENSE
diff --git a/scrplugin/LICENSE.asm b/scrplugin/maven-scr-plugin/LICENSE.asm
similarity index 100%
rename from scrplugin/LICENSE.asm
rename to scrplugin/maven-scr-plugin/LICENSE.asm
diff --git a/scrplugin/LICENSE.slf4j b/scrplugin/maven-scr-plugin/LICENSE.slf4j
similarity index 100%
rename from scrplugin/LICENSE.slf4j
rename to scrplugin/maven-scr-plugin/LICENSE.slf4j
diff --git a/scrplugin/NOTICE b/scrplugin/maven-scr-plugin/NOTICE
similarity index 100%
rename from scrplugin/NOTICE
rename to scrplugin/maven-scr-plugin/NOTICE
diff --git a/scrplugin/pom.xml b/scrplugin/maven-scr-plugin/pom.xml
similarity index 100%
rename from scrplugin/pom.xml
rename to scrplugin/maven-scr-plugin/pom.xml
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/Constants.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/Constants.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Constants.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/JavaClassDescriptorManager.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/Log.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Log.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/Log.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/Log.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorException.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorFailureException.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorGenerator.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntJavaClassDescriptorManager.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/AntLog.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/ant/SCRDescriptorTask.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/IssueLog.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/PropertyHandler.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/helper/StringUtils.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenJavaClassDescriptorManager.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/MavenLog.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/AbstractObject.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Component.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Components.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Components.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Implementation.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Interface.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Property.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Property.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Reference.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/Service.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/AttributeDefinition.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/Designate.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MTObject.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/MetaData.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/om/metatype/OCD.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ClassUtil.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescription.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaClassDescriptionInheritanceComparator.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaField.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaMethod.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaParameter.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/JavaTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/ModifiableJavaClassDescription.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaClassDescription.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationJavaField.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProvider.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/AnnotationTagProviderManager.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/AbstractTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/DefaultAnnotationTagProvider.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/PropertyTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ReferenceTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ServiceTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/Util.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/package-info.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/package-info.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingAnnotationTagProvider.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterComponentTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingFilterServiceTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletComponentTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletPropertyTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/sling/SlingServletServiceTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaClassDescription.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaField.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaMethod.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaParameter.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/cl/ClassLoaderJavaTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaClassDescription.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaField.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaMethod.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaParameter.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/tags/qdox/QDoxJavaTag.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/IOUtils.java
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java b/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
similarity index 100%
rename from scrplugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
rename to scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
diff --git a/scrplugin/src/main/resources/scrtask.properties b/scrplugin/maven-scr-plugin/src/main/resources/scrtask.properties
similarity index 100%
rename from scrplugin/src/main/resources/scrtask.properties
rename to scrplugin/maven-scr-plugin/src/main/resources/scrtask.properties