diff --git a/.project b/.project
index d977b87..eff8abb 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>hera</name>
+	<name>org.synyx.hera</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/hera-core/.classpath b/core/.classpath
similarity index 100%
rename from hera-core/.classpath
rename to core/.classpath
diff --git a/hera-core/.project b/core/.project
similarity index 97%
rename from hera-core/.project
rename to core/.project
index de0038f..404d1a4 100644
--- a/hera-core/.project
+++ b/core/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>hera-core</name>
+	<name>org.synyx.hera.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/hera-core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from hera-core/.settings/org.eclipse.jdt.core.prefs
rename to core/.settings/org.eclipse.jdt.core.prefs
diff --git a/hera-core/.settings/org.eclipse.wst.common.component b/core/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from hera-core/.settings/org.eclipse.wst.common.component
rename to core/.settings/org.eclipse.wst.common.component
diff --git a/hera-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/core/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from hera-core/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to core/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/hera-core/.settings/org.maven.ide.eclipse.prefs b/core/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from hera-core/.settings/org.maven.ide.eclipse.prefs
rename to core/.settings/org.maven.ide.eclipse.prefs
diff --git a/hera-core/.springBeans b/core/.springBeans
similarity index 100%
rename from hera-core/.springBeans
rename to core/.springBeans
diff --git a/hera-core/pom.xml b/core/pom.xml
similarity index 93%
rename from hera-core/pom.xml
rename to core/pom.xml
index d17a24e..cf9e5ae 100644
--- a/hera-core/pom.xml
+++ b/core/pom.xml
@@ -1,14 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.synyx.hera</groupId>
 	<artifactId>hera-core</artifactId>
-	<version>0.5-SNAPSHOT</version>
 
 	<name>Hera Core</name>
 	<description>Core plugin infrastructure</description>
 
 	<parent>
-		<artifactId>hera</artifactId>
+		<artifactId>org.synyx.hera</artifactId>
 		<groupId>org.synyx.hera</groupId>
 		<version>0.5-SNAPSHOT</version>
 	</parent>
@@ -62,4 +60,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/hera-core/src/doc/core.xml b/core/src/doc/core.xml
similarity index 100%
rename from hera-core/src/doc/core.xml
rename to core/src/doc/core.xml
diff --git a/hera-core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java b/core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java
rename to core/src/main/java/org/synyx/hera/core/OrderAwarePluginRegistry.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/Plugin.java b/core/src/main/java/org/synyx/hera/core/Plugin.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/Plugin.java
rename to core/src/main/java/org/synyx/hera/core/Plugin.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/PluginRegistry.java b/core/src/main/java/org/synyx/hera/core/PluginRegistry.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/PluginRegistry.java
rename to core/src/main/java/org/synyx/hera/core/PluginRegistry.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java b/core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java
rename to core/src/main/java/org/synyx/hera/core/SimplePluginRegistry.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java b/core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java
rename to core/src/main/java/org/synyx/hera/core/config/PluginListDefinitionParser.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/config/PluginNamespaceHandler.java b/core/src/main/java/org/synyx/hera/core/config/PluginNamespaceHandler.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/config/PluginNamespaceHandler.java
rename to core/src/main/java/org/synyx/hera/core/config/PluginNamespaceHandler.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/config/PluginRegistryDefinitionParser.java b/core/src/main/java/org/synyx/hera/core/config/PluginRegistryDefinitionParser.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/config/PluginRegistryDefinitionParser.java
rename to core/src/main/java/org/synyx/hera/core/config/PluginRegistryDefinitionParser.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/config/package.html b/core/src/main/java/org/synyx/hera/core/config/package.html
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/config/package.html
rename to core/src/main/java/org/synyx/hera/core/config/package.html
diff --git a/hera-core/src/main/java/org/synyx/hera/core/package.html b/core/src/main/java/org/synyx/hera/core/package.html
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/package.html
rename to core/src/main/java/org/synyx/hera/core/package.html
diff --git a/hera-core/src/main/java/org/synyx/hera/core/support/AbstractTypeAwareSupport.java b/core/src/main/java/org/synyx/hera/core/support/AbstractTypeAwareSupport.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/support/AbstractTypeAwareSupport.java
rename to core/src/main/java/org/synyx/hera/core/support/AbstractTypeAwareSupport.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java b/core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java
rename to core/src/main/java/org/synyx/hera/core/support/BeanListFactoryBean.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java b/core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java
rename to core/src/main/java/org/synyx/hera/core/support/PluginRegistryFactoryBean.java
diff --git a/hera-core/src/main/java/org/synyx/hera/core/support/package.html b/core/src/main/java/org/synyx/hera/core/support/package.html
similarity index 100%
rename from hera-core/src/main/java/org/synyx/hera/core/support/package.html
rename to core/src/main/java/org/synyx/hera/core/support/package.html
diff --git a/hera-core/src/main/resources/META-INF/spring.handlers b/core/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from hera-core/src/main/resources/META-INF/spring.handlers
rename to core/src/main/resources/META-INF/spring.handlers
diff --git a/hera-core/src/main/resources/META-INF/spring.schemas b/core/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from hera-core/src/main/resources/META-INF/spring.schemas
rename to core/src/main/resources/META-INF/spring.schemas
diff --git a/hera-core/src/main/resources/org/synyx/hera/core/config/hera.xsd b/core/src/main/resources/org/synyx/hera/core/config/hera.xsd
similarity index 100%
rename from hera-core/src/main/resources/org/synyx/hera/core/config/hera.xsd
rename to core/src/main/resources/org/synyx/hera/core/config/hera.xsd
diff --git a/hera-core/src/test/java/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.java b/core/src/test/java/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.java
similarity index 100%
rename from hera-core/src/test/java/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.java
rename to core/src/test/java/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.java
diff --git a/hera-core/src/test/java/org/synyx/hera/core/SamplePlugin.java b/core/src/test/java/org/synyx/hera/core/SamplePlugin.java
similarity index 100%
rename from hera-core/src/test/java/org/synyx/hera/core/SamplePlugin.java
rename to core/src/test/java/org/synyx/hera/core/SamplePlugin.java
diff --git a/hera-core/src/test/java/org/synyx/hera/core/SamplePluginHost.java b/core/src/test/java/org/synyx/hera/core/SamplePluginHost.java
similarity index 100%
rename from hera-core/src/test/java/org/synyx/hera/core/SamplePluginHost.java
rename to core/src/test/java/org/synyx/hera/core/SamplePluginHost.java
diff --git a/hera-core/src/test/java/org/synyx/hera/core/SamplePluginImplementation.java b/core/src/test/java/org/synyx/hera/core/SamplePluginImplementation.java
similarity index 100%
rename from hera-core/src/test/java/org/synyx/hera/core/SamplePluginImplementation.java
rename to core/src/test/java/org/synyx/hera/core/SamplePluginImplementation.java
diff --git a/hera-core/src/test/java/org/synyx/hera/core/SimplePluginRegistryUnitTest.java b/core/src/test/java/org/synyx/hera/core/SimplePluginRegistryUnitTest.java
similarity index 100%
rename from hera-core/src/test/java/org/synyx/hera/core/SimplePluginRegistryUnitTest.java
rename to core/src/test/java/org/synyx/hera/core/SimplePluginRegistryUnitTest.java
diff --git a/hera-core/src/test/java/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.java b/core/src/test/java/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.java
similarity index 100%
rename from hera-core/src/test/java/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.java
rename to core/src/test/java/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.java
diff --git a/hera-core/src/test/resources/application-context.xml b/core/src/test/resources/application-context.xml
similarity index 100%
rename from hera-core/src/test/resources/application-context.xml
rename to core/src/test/resources/application-context.xml
diff --git a/hera-core/src/test/resources/log4j.properties b/core/src/test/resources/log4j.properties
similarity index 100%
rename from hera-core/src/test/resources/log4j.properties
rename to core/src/test/resources/log4j.properties
diff --git a/core/target/classes/META-INF/MANIFEST.MF b/core/target/classes/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3760f2f
--- /dev/null
+++ b/core/target/classes/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Export-Package: org.synyx.hera.core;uses:="org.springframework.core.an
+ notation";version="0.5.0.SNAPSHOT",org.synyx.hera.core.config;uses:="
+ org.springframework.beans.factory.support,org.springframework.beans.f
+ actory.xml,org.w3c.dom";version="0.5.0.SNAPSHOT",org.synyx.hera.core.
+ support;uses:="org.synyx.hera.core,org.springframework.beans,org.spri
+ ngframework.context,org.springframework.beans.factory";version="0.5.0
+ .SNAPSHOT"
+Tool: Bnd-0.0.255
+Bundle-Name: Hera Core
+Created-By: 1.6.0_13 (Apple Inc.)
+Bundle-Vendor: Synyx GmbH & Co. KG
+Bundle-Version: 0.5.0.SNAPSHOT
+Bnd-LastModified: 1249492300509
+Bundle-ManifestVersion: 2
+Bundle-Description: Core plugin infrastructure
+Import-Package: org.springframework.beans;version="2.5",org.springfram
+ ework.beans.factory;version="2.5",org.springframework.beans.factory.s
+ upport;version="2.5",org.springframework.beans.factory.xml;version="2
+ .5",org.springframework.context;version="2.5",org.springframework.cor
+ e.annotation;version="2.5",org.synyx.hera.core;version="0.5.0.SNAPSHO
+ T",org.synyx.hera.core.config;version="0.5.0.SNAPSHOT",org.synyx.hera
+ .core.support;version="0.5.0.SNAPSHOT",org.w3c.dom
+Bundle-SymbolicName: org.synyx.hera
+Bundle-DocURL: http://www.synyx.org
+
diff --git a/core/target/classes/META-INF/spring.handlers b/core/target/classes/META-INF/spring.handlers
new file mode 100644
index 0000000..4da21bc
--- /dev/null
+++ b/core/target/classes/META-INF/spring.handlers
@@ -0,0 +1 @@
+http\://schemas.synyx.org/hera=org.synyx.hera.core.config.PluginNamespaceHandler
\ No newline at end of file
diff --git a/core/target/classes/META-INF/spring.schemas b/core/target/classes/META-INF/spring.schemas
new file mode 100644
index 0000000..6d65888
--- /dev/null
+++ b/core/target/classes/META-INF/spring.schemas
@@ -0,0 +1 @@
+http\://schemas.synyx.org/hera/hera.xsd=org/synyx/hera/core/config/hera.xsd
\ No newline at end of file
diff --git a/core/target/classes/org/synyx/hera/core/OrderAwarePluginRegistry.class b/core/target/classes/org/synyx/hera/core/OrderAwarePluginRegistry.class
new file mode 100644
index 0000000..aa206a5
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/OrderAwarePluginRegistry.class differ
diff --git a/core/target/classes/org/synyx/hera/core/Plugin.class b/core/target/classes/org/synyx/hera/core/Plugin.class
new file mode 100644
index 0000000..f9bc74f
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/Plugin.class differ
diff --git a/core/target/classes/org/synyx/hera/core/PluginRegistry.class b/core/target/classes/org/synyx/hera/core/PluginRegistry.class
new file mode 100644
index 0000000..0b0706c
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/PluginRegistry.class differ
diff --git a/core/target/classes/org/synyx/hera/core/SimplePluginRegistry.class b/core/target/classes/org/synyx/hera/core/SimplePluginRegistry.class
new file mode 100644
index 0000000..38fc225
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/SimplePluginRegistry.class differ
diff --git a/core/target/classes/org/synyx/hera/core/config/PluginListDefinitionParser.class b/core/target/classes/org/synyx/hera/core/config/PluginListDefinitionParser.class
new file mode 100644
index 0000000..7044270
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/config/PluginListDefinitionParser.class differ
diff --git a/core/target/classes/org/synyx/hera/core/config/PluginNamespaceHandler.class b/core/target/classes/org/synyx/hera/core/config/PluginNamespaceHandler.class
new file mode 100644
index 0000000..7edace4
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/config/PluginNamespaceHandler.class differ
diff --git a/core/target/classes/org/synyx/hera/core/config/PluginRegistryDefinitionParser.class b/core/target/classes/org/synyx/hera/core/config/PluginRegistryDefinitionParser.class
new file mode 100644
index 0000000..617f25b
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/config/PluginRegistryDefinitionParser.class differ
diff --git a/core/target/classes/org/synyx/hera/core/config/hera.xsd b/core/target/classes/org/synyx/hera/core/config/hera.xsd
new file mode 100644
index 0000000..ae09248
--- /dev/null
+++ b/core/target/classes/org/synyx/hera/core/config/hera.xsd
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xsd:schema xmlns="http://schemas.synyx.org/hera"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:tool="http://www.springframework.org/schema/tool"
+	targetNamespace="http://schemas.synyx.org/hera"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	
+	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	
+
+	<xsd:element name="list" type="pluginType">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports identifier="@id" type="java.util.List" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+	
+	<xsd:element name="registry" type="pluginType">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports identifier="@id" type="org.synyx.plugin.core.PluginRegistry" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+	
+	<xsd:complexType name="pluginType">
+		<xsd:attribute name="id" type="xsd:string" />
+		<xsd:attribute name="class" type="classType" />
+		<xsd:attribute name="init-factories" type="xsd:boolean" default="false" />
+	</xsd:complexType>
+	
+	<xsd:simpleType name="classType">
+		<xsd:annotation>
+			<xsd:appinfo>
+                <tool:annotation kind="direct">
+                     <tool:expected-type type="java.lang.Class" />
+                 </tool:annotation>
+             </xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string" />
+	</xsd:simpleType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/core/target/classes/org/synyx/hera/core/support/AbstractTypeAwareSupport.class b/core/target/classes/org/synyx/hera/core/support/AbstractTypeAwareSupport.class
new file mode 100644
index 0000000..00b2c86
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/support/AbstractTypeAwareSupport.class differ
diff --git a/core/target/classes/org/synyx/hera/core/support/BeanListFactoryBean.class b/core/target/classes/org/synyx/hera/core/support/BeanListFactoryBean.class
new file mode 100644
index 0000000..ddc7257
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/support/BeanListFactoryBean.class differ
diff --git a/core/target/classes/org/synyx/hera/core/support/PluginRegistryFactoryBean.class b/core/target/classes/org/synyx/hera/core/support/PluginRegistryFactoryBean.class
new file mode 100644
index 0000000..16e4b60
Binary files /dev/null and b/core/target/classes/org/synyx/hera/core/support/PluginRegistryFactoryBean.class differ
diff --git a/core/target/hera-core-0.5-SNAPSHOT-sources.jar b/core/target/hera-core-0.5-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..f7824ab
Binary files /dev/null and b/core/target/hera-core-0.5-SNAPSHOT-sources.jar differ
diff --git a/core/target/hera-core-0.5-SNAPSHOT.jar b/core/target/hera-core-0.5-SNAPSHOT.jar
new file mode 100644
index 0000000..5ae2569
Binary files /dev/null and b/core/target/hera-core-0.5-SNAPSHOT.jar differ
diff --git a/core/target/maven-archiver/pom.properties b/core/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..4094cc8
--- /dev/null
+++ b/core/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Aug 05 19:11:43 CEST 2009
+version=0.5-SNAPSHOT
+groupId=org.synyx.hera
+artifactId=hera-core
diff --git a/core/target/surefire-reports/TEST-org.synyx.hera.core.OrderAwarePluginRegistryUnitTest.xml b/core/target/surefire-reports/TEST-org.synyx.hera.core.OrderAwarePluginRegistryUnitTest.xml
new file mode 100644
index 0000000..92a239c
--- /dev/null
+++ b/core/target/surefire-reports/TEST-org.synyx.hera.core.OrderAwarePluginRegistryUnitTest.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.029" errors="0" skipped="0" tests="8" name="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest">
+  <properties>
+    <property name="java.vendor" value="Apple Inc."/>
+    <property name="localRepository" value="/Users/olivergierke/.m2/repository"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
+    <property name="os.name" value="Mac OS X"/>
+    <property name="sun.boot.class.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsfd.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/laf.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/sunrsasign.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsse.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jce.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/charsets.jar"/>
+    <property name="env.TMPDIR" value="/var/folders/pM/pMiDtflBHwGXrI8njdh15k+++TI/-Tmp-/"/>
+    <property name="env.PWD" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera"/>
+    <property name="env.LANG" value="de_DE.UTF-8"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.runtime.version" value="1.6.0_13-b03-211"/>
+    <property name="env.Apple_PubSub_Socket_Render" value="/tmp/launch-4ZtIUs/Render"/>
+    <property name="env.DISPLAY" value="/tmp/launch-AlFZmq/:0"/>
+    <property name="user.name" value="olivergierke"/>
+    <property name="env.USER" value="olivergierke"/>
+    <property name="env.SHELL" value="/bin/bash"/>
+    <property name="env.__CF_USER_TEXT_ENCODING" value="0x1F5:0:3"/>
+    <property name="awt.nativeDoubleBuffering" value="true"/>
+    <property name="env.PATH" value="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/local/git/bin:/Applications/Tools/bundlor/bin:/Applications/Tools/grails/bin:/Applications/Tools/pax-construct-1.4/bin:/Applications/Tools/roo/bin"/>
+    <property name="user.language" value="de"/>
+    <property name="sun.boot.library.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Libraries"/>
+    <property name="classworlds.conf" value="/usr/share/maven/bin/m2.conf"/>
+    <property name="java.version" value="1.6.0_13"/>
+    <property name="user.timezone" value="Europe/Berlin"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="java.endorsed.dirs" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/endorsed"/>
+    <property name="sun.cpu.isalist" value=""/>
+    <property name="sun.jnu.encoding" value="MacRoman"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="env.SHLVL" value="1"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="user.country" value="DE"/>
+    <property name="java.home" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="env.LOGNAME" value="olivergierke"/>
+    <property name="os.version" value="10.5.7"/>
+    <property name="env.TERM_PROGRAM_VERSION" value="240.2"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.version" value="11.3-b02-83"/>
+    <property name="env.JAVA_HOME" value="/Library/Java/Home"/>
+    <property name="java.awt.printerjob" value="apple.awt.CPrinterJob"/>
+    <property name="env.TERM" value="xterm-color"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="awt.toolkit" value="apple.awt.CToolkit"/>
+    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="env.MANPATH" value="/usr/share/man:/usr/local/share/man:/usr/X11/man:/usr/local/git/man"/>
+    <property name="user.home" value="/Users/olivergierke"/>
+    <property name="env.OLDPWD" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera"/>
+    <property name="env.JAVA_MAIN_CLASS_6315" value="org.codehaus.classworlds.Launcher"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="env.TERM_PROGRAM" value="Apple_Terminal"/>
+    <property name="java.library.path" value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
+    <property name="java.vendor.url" value="http://www.apple.com/"/>
+    <property name="java.vm.vendor" value="Apple Inc."/>
+    <property name="gopherProxySet" value="false"/>
+    <property name="maven.home" value="/usr/share/maven"/>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="java.class.path" value="/usr/share/maven/boot/classworlds-1.1.jar"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="env.HOME" value="/Users/olivergierke"/>
+    <property name="surefire.test.class.path" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core/target/test-classes:/Users/olivergierke/Documents/workspace35/org.synyx.hera/core/target/classes:/Users/olivergierke/.m2/repository/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar:/Users/olivergierke/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-core/2.5.6/spring-core-2.5.6.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar:/Users/olivergierke/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-test/2.5.6/spring-test-2.5.6.jar:/Users/olivergierke/.m2/repository/junit/junit/4.4/junit-4.4.jar:/Users/olivergierke/.m2/repository/org/apache/log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar:"/>
+    <property name="java.io.tmpdir" value="/var/folders/pM/pMiDtflBHwGXrI8njdh15k+++TI/-Tmp-/"/>
+    <property name="java.vendor.url.bug" value="http://bugreport.apple.com/"/>
+    <property name="env.MAVEN_OPTS" value="-Xmx256m"/>
+    <property name="env.SSH_AUTH_SOCK" value="/tmp/launch-qbm3RH/Listeners"/>
+    <property name="env.COMMAND_MODE" value="unix2003"/>
+    <property name="java.awt.graphicsenv" value="apple.awt.CGraphicsEnvironment"/>
+    <property name="os.arch" value="x86_64"/>
+    <property name="java.ext.dirs" value="/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/ext"/>
+    <property name="user.dir" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core"/>
+    <property name="mrj.version" value="1050.1.6.0_13-211"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
+    <property name="basedir" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core"/>
+    <property name="file.encoding" value="MacRoman"/>
+    <property name="env.GRAILS_HOME" value="/Applications/Tools/grails"/>
+    <property name="java.specification.version" value="1.6"/>
+  </properties>
+  <testcase time="0.007" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="honorsOrderOnAddPlugins"/>
+  <testcase time="0.002" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="assertsOrderOnAddingPlugins"/>
+  <testcase time="0.002" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="assertRegistryInitialized"/>
+  <testcase time="0.002" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="assertFindsEmailNotificationProvider"/>
+  <testcase time="0.002" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="throwsExceptionIfNoPluginFound"/>
+  <testcase time="0.003" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="throwsExceptionIfNoPluginsFound"/>
+  <testcase time="0.001" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="returnsDefaultIfNoneFound"/>
+  <testcase time="0.002" classname="org.synyx.hera.core.OrderAwarePluginRegistryUnitTest" name="returnsDefaultsIfNoneFound"/>
+</testsuite>
\ No newline at end of file
diff --git a/core/target/surefire-reports/TEST-org.synyx.hera.core.SimplePluginRegistryUnitTest.xml b/core/target/surefire-reports/TEST-org.synyx.hera.core.SimplePluginRegistryUnitTest.xml
new file mode 100644
index 0000000..d679e9d
--- /dev/null
+++ b/core/target/surefire-reports/TEST-org.synyx.hera.core.SimplePluginRegistryUnitTest.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.02" errors="0" skipped="0" tests="6" name="org.synyx.hera.core.SimplePluginRegistryUnitTest">
+  <properties>
+    <property name="java.vendor" value="Apple Inc."/>
+    <property name="localRepository" value="/Users/olivergierke/.m2/repository"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
+    <property name="os.name" value="Mac OS X"/>
+    <property name="sun.boot.class.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsfd.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/laf.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/sunrsasign.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsse.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jce.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/charsets.jar"/>
+    <property name="env.TMPDIR" value="/var/folders/pM/pMiDtflBHwGXrI8njdh15k+++TI/-Tmp-/"/>
+    <property name="env.PWD" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera"/>
+    <property name="env.LANG" value="de_DE.UTF-8"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.runtime.version" value="1.6.0_13-b03-211"/>
+    <property name="env.Apple_PubSub_Socket_Render" value="/tmp/launch-4ZtIUs/Render"/>
+    <property name="env.DISPLAY" value="/tmp/launch-AlFZmq/:0"/>
+    <property name="user.name" value="olivergierke"/>
+    <property name="env.USER" value="olivergierke"/>
+    <property name="env.SHELL" value="/bin/bash"/>
+    <property name="env.__CF_USER_TEXT_ENCODING" value="0x1F5:0:3"/>
+    <property name="awt.nativeDoubleBuffering" value="true"/>
+    <property name="env.PATH" value="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/local/git/bin:/Applications/Tools/bundlor/bin:/Applications/Tools/grails/bin:/Applications/Tools/pax-construct-1.4/bin:/Applications/Tools/roo/bin"/>
+    <property name="user.language" value="de"/>
+    <property name="sun.boot.library.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Libraries"/>
+    <property name="classworlds.conf" value="/usr/share/maven/bin/m2.conf"/>
+    <property name="java.version" value="1.6.0_13"/>
+    <property name="user.timezone" value="Europe/Berlin"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="java.endorsed.dirs" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/endorsed"/>
+    <property name="sun.cpu.isalist" value=""/>
+    <property name="sun.jnu.encoding" value="MacRoman"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="env.SHLVL" value="1"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="user.country" value="DE"/>
+    <property name="java.home" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="env.LOGNAME" value="olivergierke"/>
+    <property name="os.version" value="10.5.7"/>
+    <property name="env.TERM_PROGRAM_VERSION" value="240.2"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.version" value="11.3-b02-83"/>
+    <property name="env.JAVA_HOME" value="/Library/Java/Home"/>
+    <property name="java.awt.printerjob" value="apple.awt.CPrinterJob"/>
+    <property name="env.TERM" value="xterm-color"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="awt.toolkit" value="apple.awt.CToolkit"/>
+    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="env.MANPATH" value="/usr/share/man:/usr/local/share/man:/usr/X11/man:/usr/local/git/man"/>
+    <property name="user.home" value="/Users/olivergierke"/>
+    <property name="env.OLDPWD" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera"/>
+    <property name="env.JAVA_MAIN_CLASS_6315" value="org.codehaus.classworlds.Launcher"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="env.TERM_PROGRAM" value="Apple_Terminal"/>
+    <property name="java.library.path" value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
+    <property name="java.vendor.url" value="http://www.apple.com/"/>
+    <property name="java.vm.vendor" value="Apple Inc."/>
+    <property name="gopherProxySet" value="false"/>
+    <property name="maven.home" value="/usr/share/maven"/>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="java.class.path" value="/usr/share/maven/boot/classworlds-1.1.jar"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="env.HOME" value="/Users/olivergierke"/>
+    <property name="surefire.test.class.path" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core/target/test-classes:/Users/olivergierke/Documents/workspace35/org.synyx.hera/core/target/classes:/Users/olivergierke/.m2/repository/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar:/Users/olivergierke/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-core/2.5.6/spring-core-2.5.6.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar:/Users/olivergierke/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-test/2.5.6/spring-test-2.5.6.jar:/Users/olivergierke/.m2/repository/junit/junit/4.4/junit-4.4.jar:/Users/olivergierke/.m2/repository/org/apache/log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar:"/>
+    <property name="java.io.tmpdir" value="/var/folders/pM/pMiDtflBHwGXrI8njdh15k+++TI/-Tmp-/"/>
+    <property name="java.vendor.url.bug" value="http://bugreport.apple.com/"/>
+    <property name="env.MAVEN_OPTS" value="-Xmx256m"/>
+    <property name="env.SSH_AUTH_SOCK" value="/tmp/launch-qbm3RH/Listeners"/>
+    <property name="env.COMMAND_MODE" value="unix2003"/>
+    <property name="java.awt.graphicsenv" value="apple.awt.CGraphicsEnvironment"/>
+    <property name="os.arch" value="x86_64"/>
+    <property name="java.ext.dirs" value="/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/ext"/>
+    <property name="user.dir" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core"/>
+    <property name="mrj.version" value="1050.1.6.0_13-211"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
+    <property name="basedir" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core"/>
+    <property name="file.encoding" value="MacRoman"/>
+    <property name="env.GRAILS_HOME" value="/Applications/Tools/grails"/>
+    <property name="java.specification.version" value="1.6"/>
+  </properties>
+  <testcase time="0.002" classname="org.synyx.hera.core.SimplePluginRegistryUnitTest" name="assertRegistryInitialized"/>
+  <testcase time="0.006" classname="org.synyx.hera.core.SimplePluginRegistryUnitTest" name="assertFindsEmailNotificationProvider"/>
+  <testcase time="0.001" classname="org.synyx.hera.core.SimplePluginRegistryUnitTest" name="throwsExceptionIfNoPluginFound"/>
+  <testcase time="0.001" classname="org.synyx.hera.core.SimplePluginRegistryUnitTest" name="throwsExceptionIfNoPluginsFound"/>
+  <testcase time="0.001" classname="org.synyx.hera.core.SimplePluginRegistryUnitTest" name="returnsDefaultIfNoneFound"/>
+  <testcase time="0.001" classname="org.synyx.hera.core.SimplePluginRegistryUnitTest" name="returnsDefaultsIfNoneFound"/>
+</testsuite>
\ No newline at end of file
diff --git a/core/target/surefire-reports/TEST-org.synyx.hera.core.config.PluginConfigurationIntegrationTest.xml b/core/target/surefire-reports/TEST-org.synyx.hera.core.config.PluginConfigurationIntegrationTest.xml
new file mode 100644
index 0000000..d29682f
--- /dev/null
+++ b/core/target/surefire-reports/TEST-org.synyx.hera.core.config.PluginConfigurationIntegrationTest.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.643" errors="0" skipped="0" tests="1" name="org.synyx.hera.core.config.PluginConfigurationIntegrationTest">
+  <properties>
+    <property name="java.vendor" value="Apple Inc."/>
+    <property name="localRepository" value="/Users/olivergierke/.m2/repository"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.management.compiler" value="HotSpot 64-Bit Server Compiler"/>
+    <property name="os.name" value="Mac OS X"/>
+    <property name="sun.boot.class.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsfd.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/laf.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/sunrsasign.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsse.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jce.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/charsets.jar"/>
+    <property name="env.TMPDIR" value="/var/folders/pM/pMiDtflBHwGXrI8njdh15k+++TI/-Tmp-/"/>
+    <property name="env.PWD" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera"/>
+    <property name="env.LANG" value="de_DE.UTF-8"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.runtime.version" value="1.6.0_13-b03-211"/>
+    <property name="env.Apple_PubSub_Socket_Render" value="/tmp/launch-4ZtIUs/Render"/>
+    <property name="env.DISPLAY" value="/tmp/launch-AlFZmq/:0"/>
+    <property name="user.name" value="olivergierke"/>
+    <property name="env.USER" value="olivergierke"/>
+    <property name="env.SHELL" value="/bin/bash"/>
+    <property name="env.__CF_USER_TEXT_ENCODING" value="0x1F5:0:3"/>
+    <property name="awt.nativeDoubleBuffering" value="true"/>
+    <property name="env.PATH" value="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/local/git/bin:/Applications/Tools/bundlor/bin:/Applications/Tools/grails/bin:/Applications/Tools/pax-construct-1.4/bin:/Applications/Tools/roo/bin"/>
+    <property name="user.language" value="de"/>
+    <property name="sun.boot.library.path" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Libraries"/>
+    <property name="classworlds.conf" value="/usr/share/maven/bin/m2.conf"/>
+    <property name="java.version" value="1.6.0_13"/>
+    <property name="user.timezone" value="Europe/Berlin"/>
+    <property name="sun.arch.data.model" value="64"/>
+    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="java.endorsed.dirs" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/endorsed"/>
+    <property name="sun.cpu.isalist" value=""/>
+    <property name="sun.jnu.encoding" value="MacRoman"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="env.SHLVL" value="1"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="user.country" value="DE"/>
+    <property name="java.home" value="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="env.LOGNAME" value="olivergierke"/>
+    <property name="os.version" value="10.5.7"/>
+    <property name="env.TERM_PROGRAM_VERSION" value="240.2"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.version" value="11.3-b02-83"/>
+    <property name="env.JAVA_HOME" value="/Library/Java/Home"/>
+    <property name="java.awt.printerjob" value="apple.awt.CPrinterJob"/>
+    <property name="env.TERM" value="xterm-color"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="awt.toolkit" value="apple.awt.CToolkit"/>
+    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
+    <property name="env.MANPATH" value="/usr/share/man:/usr/local/share/man:/usr/X11/man:/usr/local/git/man"/>
+    <property name="user.home" value="/Users/olivergierke"/>
+    <property name="env.OLDPWD" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera"/>
+    <property name="env.JAVA_MAIN_CLASS_6315" value="org.codehaus.classworlds.Launcher"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="env.TERM_PROGRAM" value="Apple_Terminal"/>
+    <property name="java.library.path" value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
+    <property name="java.vendor.url" value="http://www.apple.com/"/>
+    <property name="java.vm.vendor" value="Apple Inc."/>
+    <property name="gopherProxySet" value="false"/>
+    <property name="maven.home" value="/usr/share/maven"/>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="java.class.path" value="/usr/share/maven/boot/classworlds-1.1.jar"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="env.HOME" value="/Users/olivergierke"/>
+    <property name="surefire.test.class.path" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core/target/test-classes:/Users/olivergierke/Documents/workspace35/org.synyx.hera/core/target/classes:/Users/olivergierke/.m2/repository/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar:/Users/olivergierke/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-core/2.5.6/spring-core-2.5.6.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar:/Users/olivergierke/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar:/Users/olivergierke/.m2/repository/org/springframework/spring-test/2.5.6/spring-test-2.5.6.jar:/Users/olivergierke/.m2/repository/junit/junit/4.4/junit-4.4.jar:/Users/olivergierke/.m2/repository/org/apache/log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar:"/>
+    <property name="java.io.tmpdir" value="/var/folders/pM/pMiDtflBHwGXrI8njdh15k+++TI/-Tmp-/"/>
+    <property name="java.vendor.url.bug" value="http://bugreport.apple.com/"/>
+    <property name="env.MAVEN_OPTS" value="-Xmx256m"/>
+    <property name="env.SSH_AUTH_SOCK" value="/tmp/launch-qbm3RH/Listeners"/>
+    <property name="env.COMMAND_MODE" value="unix2003"/>
+    <property name="java.awt.graphicsenv" value="apple.awt.CGraphicsEnvironment"/>
+    <property name="os.arch" value="x86_64"/>
+    <property name="java.ext.dirs" value="/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/lib/ext"/>
+    <property name="user.dir" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core"/>
+    <property name="mrj.version" value="1050.1.6.0_13-211"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
+    <property name="basedir" value="/Users/olivergierke/Documents/workspace35/org.synyx.hera/core"/>
+    <property name="file.encoding" value="MacRoman"/>
+    <property name="env.GRAILS_HOME" value="/Applications/Tools/grails"/>
+    <property name="java.specification.version" value="1.6"/>
+  </properties>
+  <testcase time="0.008" classname="org.synyx.hera.core.config.PluginConfigurationIntegrationTest" name="test"/>
+</testsuite>
\ No newline at end of file
diff --git a/core/target/surefire-reports/org.synyx.hera.core.OrderAwarePluginRegistryUnitTest.txt b/core/target/surefire-reports/org.synyx.hera.core.OrderAwarePluginRegistryUnitTest.txt
new file mode 100644
index 0000000..13ac541
--- /dev/null
+++ b/core/target/surefire-reports/org.synyx.hera.core.OrderAwarePluginRegistryUnitTest.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.synyx.hera.core.OrderAwarePluginRegistryUnitTest
+-------------------------------------------------------------------------------
+Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 sec
diff --git a/core/target/surefire-reports/org.synyx.hera.core.SimplePluginRegistryUnitTest.txt b/core/target/surefire-reports/org.synyx.hera.core.SimplePluginRegistryUnitTest.txt
new file mode 100644
index 0000000..6608e7f
--- /dev/null
+++ b/core/target/surefire-reports/org.synyx.hera.core.SimplePluginRegistryUnitTest.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.synyx.hera.core.SimplePluginRegistryUnitTest
+-------------------------------------------------------------------------------
+Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 sec
diff --git a/core/target/surefire-reports/org.synyx.hera.core.config.PluginConfigurationIntegrationTest.txt b/core/target/surefire-reports/org.synyx.hera.core.config.PluginConfigurationIntegrationTest.txt
new file mode 100644
index 0000000..8f7da40
--- /dev/null
+++ b/core/target/surefire-reports/org.synyx.hera.core.config.PluginConfigurationIntegrationTest.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.synyx.hera.core.config.PluginConfigurationIntegrationTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.65 sec
diff --git a/core/target/test-classes/application-context.xml b/core/target/test-classes/application-context.xml
new file mode 100644
index 0000000..c7d4ec7
--- /dev/null
+++ b/core/target/test-classes/application-context.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:plugin="http://schemas.synyx.org/hera"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://schemas.synyx.org/hera http://schemas.synyx.org/hera/hera.xsd">
+
+	<plugin:list id="foo" class="org.synyx.hera.core.SamplePlugin" />
+	
+	<plugin:registry id="bar" class="org.synyx.hera.core.SamplePlugin" />
+	
+	<bean class="org.synyx.hera.core.SamplePluginImplementation" />
+	
+	<bean id="host" class="org.synyx.hera.core.SamplePluginHost">
+		<property name="registry" ref="bar" />
+	</bean>
+
+	<bean id="otherHost" class="org.synyx.hera.core.SamplePluginHost">
+		<property name="registry">
+			<plugin:registry id="tadaa" class="org.synyx.hera.core.SamplePlugin" />
+		</property>
+	</bean>
+	
+</beans>
diff --git a/core/target/test-classes/log4j.properties b/core/target/test-classes/log4j.properties
new file mode 100644
index 0000000..3774e1f
--- /dev/null
+++ b/core/target/test-classes/log4j.properties
@@ -0,0 +1,12 @@
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+# Root logger option
+log4j.rootLogger=WARN, stdout
+
+# Hibernate logging options (INFO only shows startup messages)
+log4j.logger.org.springframework=INFO
+log4j.logger.org.synyx.hera=DEBUG
\ No newline at end of file
diff --git a/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$1.class b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$1.class
new file mode 100644
index 0000000..b67cf98
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$1.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$FirstImplementation.class b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$FirstImplementation.class
new file mode 100644
index 0000000..0285f20
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$FirstImplementation.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$SecondImplementation.class b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$SecondImplementation.class
new file mode 100644
index 0000000..83a4fcf
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$SecondImplementation.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$TestPlugin.class b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$TestPlugin.class
new file mode 100644
index 0000000..31b4933
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest$TestPlugin.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.class b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.class
new file mode 100644
index 0000000..292fc8f
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/OrderAwarePluginRegistryUnitTest.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/SamplePlugin.class b/core/target/test-classes/org/synyx/hera/core/SamplePlugin.class
new file mode 100644
index 0000000..e8fc0a5
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/SamplePlugin.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/SamplePluginHost.class b/core/target/test-classes/org/synyx/hera/core/SamplePluginHost.class
new file mode 100644
index 0000000..ddfa671
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/SamplePluginHost.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/SamplePluginImplementation.class b/core/target/test-classes/org/synyx/hera/core/SamplePluginImplementation.class
new file mode 100644
index 0000000..279d775
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/SamplePluginImplementation.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/SimplePluginRegistryUnitTest.class b/core/target/test-classes/org/synyx/hera/core/SimplePluginRegistryUnitTest.class
new file mode 100644
index 0000000..8709ad5
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/SimplePluginRegistryUnitTest.class differ
diff --git a/core/target/test-classes/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.class b/core/target/test-classes/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.class
new file mode 100644
index 0000000..343be1b
Binary files /dev/null and b/core/target/test-classes/org/synyx/hera/core/config/PluginConfigurationIntegrationTest.class differ
diff --git a/hera-metadata/.classpath b/metadata/.classpath
similarity index 100%
rename from hera-metadata/.classpath
rename to metadata/.classpath
diff --git a/hera-metadata/.project b/metadata/.project
similarity index 96%
rename from hera-metadata/.project
rename to metadata/.project
index 5740fd1..946c6a3 100644
--- a/hera-metadata/.project
+++ b/metadata/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>hera-metadata</name>
+	<name>org.synyx.hera.metadata</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/hera-metadata/.settings/org.eclipse.jdt.core.prefs b/metadata/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from hera-metadata/.settings/org.eclipse.jdt.core.prefs
rename to metadata/.settings/org.eclipse.jdt.core.prefs
diff --git a/hera-metadata/.settings/org.eclipse.wst.common.component b/metadata/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from hera-metadata/.settings/org.eclipse.wst.common.component
rename to metadata/.settings/org.eclipse.wst.common.component
diff --git a/hera-metadata/.settings/org.eclipse.wst.common.project.facet.core.xml b/metadata/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from hera-metadata/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to metadata/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/hera-metadata/.settings/org.maven.ide.eclipse.prefs b/metadata/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from hera-metadata/.settings/org.maven.ide.eclipse.prefs
rename to metadata/.settings/org.maven.ide.eclipse.prefs
diff --git a/hera-metadata/pom.xml b/metadata/pom.xml
similarity index 79%
rename from hera-metadata/pom.xml
rename to metadata/pom.xml
index 19c5b96..aed4cdb 100644
--- a/hera-metadata/pom.xml
+++ b/metadata/pom.xml
@@ -1,14 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.synyx.hera</groupId>
-	<artifactId>hera-metadata</artifactId>
-	<version>0.5-SNAPSHOT</version>
+	<artifactId>org.synyx.hera.metadata</artifactId>
 
 	<name>Hera Metadata Extension</name>
 	<description>Extension package for metadata based plugins</description>
 	
 	<parent>
-		<artifactId>hera</artifactId>
+		<artifactId>org.synyx.hera</artifactId>
 		<groupId>org.synyx.hera</groupId>
 		<version>0.5-SNAPSHOT</version>
 	</parent>
@@ -17,7 +15,7 @@
 		<dependency>
 			<groupId>org.synyx.hera</groupId>
 			<artifactId>hera-core</artifactId>
-			<version>0.5-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -27,4 +25,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/hera-metadata/src/doc/metadata.xml b/metadata/src/doc/metadata.xml
similarity index 100%
rename from hera-metadata/src/doc/metadata.xml
rename to metadata/src/doc/metadata.xml
diff --git a/hera-metadata/src/main/java/META-INF/MANIFEST.MF b/metadata/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from hera-metadata/src/main/java/META-INF/MANIFEST.MF
rename to metadata/src/main/java/META-INF/MANIFEST.MF
diff --git a/hera-metadata/src/main/java/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.java b/metadata/src/main/java/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.java
similarity index 100%
rename from hera-metadata/src/main/java/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.java
rename to metadata/src/main/java/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.java
diff --git a/hera-metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java b/metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java
similarity index 100%
rename from hera-metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java
rename to metadata/src/main/java/org/synyx/hera/metadata/MetadataProvider.java
diff --git a/hera-metadata/src/main/java/org/synyx/hera/metadata/PluginMetadata.java b/metadata/src/main/java/org/synyx/hera/metadata/PluginMetadata.java
similarity index 100%
rename from hera-metadata/src/main/java/org/synyx/hera/metadata/PluginMetadata.java
rename to metadata/src/main/java/org/synyx/hera/metadata/PluginMetadata.java
diff --git a/hera-metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java b/metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java
similarity index 100%
rename from hera-metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java
rename to metadata/src/main/java/org/synyx/hera/metadata/SimplePluginMetadata.java
diff --git a/metadata/target/classes/META-INF/MANIFEST.MF b/metadata/target/classes/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..c05cdab
--- /dev/null
+++ b/metadata/target/classes/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Export-Package: org.synyx.hera.metadata;uses:="org.synyx.hera.core,org
+ .apache.commons.lang";version="0.5.0.SNAPSHOT"
+Tool: Bnd-0.0.255
+Bundle-Name: Hera Metadata Extension
+Created-By: 1.6.0_13 (Apple Inc.)
+Bundle-Vendor: Synyx GmbH & Co. KG
+Bundle-Version: 0.5.0.SNAPSHOT
+Bnd-LastModified: 1249492303701
+Bundle-ManifestVersion: 2
+Bundle-Description: Extension package for metadata based plugins
+Import-Package: org.apache.commons.lang;version="2.4",org.synyx.hera.c
+ ore;version="0.5.0.SNAPSHOT",org.synyx.hera.metadata;version="0.5.0.S
+ NAPSHOT"
+Bundle-SymbolicName: org.synyx.hera
+Bundle-DocURL: http://www.synyx.org
+
diff --git a/metadata/target/classes/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.class b/metadata/target/classes/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.class
new file mode 100644
index 0000000..3ff600c
Binary files /dev/null and b/metadata/target/classes/org/synyx/hera/metadata/AbstractMetadataBasedPlugin.class differ
diff --git a/metadata/target/classes/org/synyx/hera/metadata/MetadataProvider.class b/metadata/target/classes/org/synyx/hera/metadata/MetadataProvider.class
new file mode 100644
index 0000000..d92fcf2
Binary files /dev/null and b/metadata/target/classes/org/synyx/hera/metadata/MetadataProvider.class differ
diff --git a/metadata/target/classes/org/synyx/hera/metadata/PluginMetadata.class b/metadata/target/classes/org/synyx/hera/metadata/PluginMetadata.class
new file mode 100644
index 0000000..a427ea0
Binary files /dev/null and b/metadata/target/classes/org/synyx/hera/metadata/PluginMetadata.class differ
diff --git a/metadata/target/classes/org/synyx/hera/metadata/SimplePluginMetadata.class b/metadata/target/classes/org/synyx/hera/metadata/SimplePluginMetadata.class
new file mode 100644
index 0000000..a732465
Binary files /dev/null and b/metadata/target/classes/org/synyx/hera/metadata/SimplePluginMetadata.class differ
diff --git a/metadata/target/maven-archiver/pom.properties b/metadata/target/maven-archiver/pom.properties
new file mode 100644
index 0000000..03cd8f8
--- /dev/null
+++ b/metadata/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Wed Aug 05 19:11:43 CEST 2009
+version=0.5-SNAPSHOT
+groupId=org.synyx.hera
+artifactId=org.synyx.hera.metadata
diff --git a/metadata/target/org.synyx.hera.metadata-0.5-SNAPSHOT-sources.jar b/metadata/target/org.synyx.hera.metadata-0.5-SNAPSHOT-sources.jar
new file mode 100644
index 0000000..4b4e49a
Binary files /dev/null and b/metadata/target/org.synyx.hera.metadata-0.5-SNAPSHOT-sources.jar differ
diff --git a/metadata/target/org.synyx.hera.metadata-0.5-SNAPSHOT.jar b/metadata/target/org.synyx.hera.metadata-0.5-SNAPSHOT.jar
new file mode 100644
index 0000000..3671105
Binary files /dev/null and b/metadata/target/org.synyx.hera.metadata-0.5-SNAPSHOT.jar differ
diff --git a/pom.xml b/pom.xml
index 9786df0..9bd11f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.synyx.hera</groupId>
-  <artifactId>hera</artifactId>
+  <artifactId>org.synyx.hera</artifactId>
   <packaging>pom</packaging>
   <name>Hera</name>
   <version>0.5-SNAPSHOT</version>
@@ -14,8 +14,8 @@
   <inceptionYear>2008</inceptionYear>
   
   <modules>
-  	<module>hera-core</module>
-  	<module>hera-metadata</module>
+  	<module>core</module>
+  	<module>metadata</module>
   </modules>
   
   <developers>
@@ -288,4 +288,4 @@
 		</repository>
 	</distributionManagement>
 	
-</project>
\ No newline at end of file
+</project>