diff --git a/ipojo/pom.xml b/ipojo/pom.xml
index 5ce5715..44b3aee 100644
--- a/ipojo/pom.xml
+++ b/ipojo/pom.xml
@@ -34,64 +34,34 @@
     <modules>
     <module>metadata</module>
     <module>manipulator</module>
-    <module>core</module>
-    <module>composite</module>
+    <module>runtime</module>
     <module>arch</module>
     <module>handler/extender</module>
     <module>handler/temporal</module>
     <module>handler/eventadmin</module>
     <module>handler/whiteboard</module>
+    <module>handler/jmx</module>
+    <module>handler/transaction</module>
     <module>api</module>
+	<module>arch-gogo</module>
+    <module>webconsole-plugin</module>
     <!-- remove junit4osgi during the release process
     <module>junit4osgi</module> -->
   </modules>
 
-
   <profiles>
-  <profile>
-    <id>junit4osgi</id>
-    <modules>
-      <module>junit4osgi</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>java5</id>
-    <activation>
-      <jdk>1.5</jdk>
-    </activation>
-    <modules>
-      <module>annotations</module>
-      <module>arch-gogo</module>
-      <module>handler/jmx</module>
-      <module>webconsole-plugin</module>
-      <module>handler/transaction</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>java6</id>
-    <activation>
-      <jdk>1.6</jdk>
-    </activation>
-    <modules>
-      <module>annotations</module>
-      <module>arch-gogo</module>
-      <module>handler/jmx</module>
-      <module>webconsole-plugin</module>
-      <module>handler/transaction</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>examples</id>
-    <modules>
-      <module>examples</module>
-    </modules>
-  </profile>
-  <profile>
-    <id>tests</id>
-    <modules>
-      <module>tests</module>
-    </modules>
-  </profile>
+      <profile>
+        <id>examples</id>
+        <modules>
+          <module>examples</module>
+        </modules>
+      </profile>
+      <profile>
+        <id>tests</id>
+        <modules>
+          <module>tests</module>
+        </modules>
+      </profile>
   </profiles>
 
     <build>
diff --git a/ipojo/runtime/DEPENDENCIES b/ipojo/runtime/DEPENDENCIES
new file mode 100644
index 0000000..8675421
--- /dev/null
+++ b/ipojo/runtime/DEPENDENCIES
@@ -0,0 +1,15 @@
+Apache Felix iPOJO Runtime Project
+Copyright 2008-2012 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party Software
+
+
+II. Used Third-Party Software
+
+
+III. Overall License Summary
+- Apache License 2.0
diff --git a/ipojo/core/LICENSE b/ipojo/runtime/LICENSE
similarity index 100%
copy from ipojo/core/LICENSE
copy to ipojo/runtime/LICENSE
diff --git a/ipojo/runtime/NOTICE b/ipojo/runtime/NOTICE
new file mode 100644
index 0000000..3325754
--- /dev/null
+++ b/ipojo/runtime/NOTICE
@@ -0,0 +1,10 @@
+Apache Felix iPOJO Runtime Project
+Copyright 2008-2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Copyright (c) 2000-2005 INRIA, France Telecom
+Licensed under BSD License.
diff --git a/ipojo/annotations/DEPENDENCIES b/ipojo/runtime/annotations/DEPENDENCIES
similarity index 100%
rename from ipojo/annotations/DEPENDENCIES
rename to ipojo/runtime/annotations/DEPENDENCIES
diff --git a/ipojo/annotations/LICENSE b/ipojo/runtime/annotations/LICENSE
similarity index 100%
rename from ipojo/annotations/LICENSE
rename to ipojo/runtime/annotations/LICENSE
diff --git a/ipojo/annotations/NOTICE b/ipojo/runtime/annotations/NOTICE
similarity index 100%
rename from ipojo/annotations/NOTICE
rename to ipojo/runtime/annotations/NOTICE
diff --git a/ipojo/annotations/doc/changelog.txt b/ipojo/runtime/annotations/doc/changelog.txt
similarity index 100%
rename from ipojo/annotations/doc/changelog.txt
rename to ipojo/runtime/annotations/doc/changelog.txt
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations.html b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations.html
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations.html
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations.html
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/apache.png b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/apache.png
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/apache.png
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/apache.png
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/button.html b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/button.html
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/button.html
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/button.html
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/button_data/2009-europe-125x125.png b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/button_data/2009-europe-125x125.png
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/button_data/2009-europe-125x125.png
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/button_data/2009-europe-125x125.png
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/feed-icon-32x32.png b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/feed-icon-32x32.png
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/feed-icon-32x32.png
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/feed-icon-32x32.png
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/footer.png b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/footer.png
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/footer.png
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/footer.png
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/ga.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/ga.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/ga.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/ga.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/header.png b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/header.png
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/header.png
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/header.png
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/hoverIntent.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/hoverIntent.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/hoverIntent.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/hoverIntent.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/information.gif b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/information.gif
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/information.gif
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/information.gif
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/ipojo.png b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/ipojo.png
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/ipojo.png
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/ipojo.png
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/jquery-1.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/jquery-1.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/jquery-1.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/jquery-1.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/linkext7.gif b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/linkext7.gif
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/linkext7.gif
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/linkext7.gif
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/logo.png b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/logo.png
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/logo.png
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/logo.png
Binary files differ
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushCSharp.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushCSharp.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushCSharp.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushCSharp.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushDelphi.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushDelphi.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushDelphi.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushDelphi.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJScript.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJScript.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJScript.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJScript.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJava.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJava.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJava.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushJava.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPhp.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPhp.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPhp.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPhp.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPython.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPython.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPython.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushPython.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushShell.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushShell.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushShell.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushShell.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushSql.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushSql.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushSql.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushSql.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushVb.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushVb.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushVb.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushVb.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushXml.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushXml.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shBrushXml.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shBrushXml.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shCore.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shCore.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/shCore.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/shCore.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/site.css b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/site.css
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/site.css
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/site.css
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/superfish.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/superfish.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/superfish.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/superfish.js
diff --git a/ipojo/annotations/doc/how-to-use-ipojo-annotations_files/supersubs.js b/ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/supersubs.js
similarity index 100%
rename from ipojo/annotations/doc/how-to-use-ipojo-annotations_files/supersubs.js
rename to ipojo/runtime/annotations/doc/how-to-use-ipojo-annotations_files/supersubs.js
diff --git a/ipojo/annotations/pom.xml b/ipojo/runtime/annotations/pom.xml
similarity index 98%
rename from ipojo/annotations/pom.xml
rename to ipojo/runtime/annotations/pom.xml
index 89c9fd6..9dbc71e 100644
--- a/ipojo/annotations/pom.xml
+++ b/ipojo/runtime/annotations/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <relativePath>../../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.felix.ipojo.annotations</artifactId>
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Bind.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Component.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Controller.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Handler.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/HandlerDeclaration.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Instantiate.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Invalidate.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Modified.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostRegistration.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/PostUnregistration.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Property.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Provides.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Requires.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceController.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/ServiceProperty.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/StaticServiceProperty.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Unbind.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Updated.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/annotations/Validate.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/extender/Extender.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Requires.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handler/temporal/Temporal.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publisher.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Publishes.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/event/Subscriber.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Config.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXBean.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXMethod.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/JMXProperty.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Method.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/handlers/jmx/Property.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transaction.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/transaction/Transactional.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Wbp.java
diff --git a/ipojo/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java b/ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java
similarity index 100%
rename from ipojo/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java
rename to ipojo/runtime/annotations/src/main/java/org/apache/felix/ipojo/whiteboard/Whiteboards.java
diff --git a/ipojo/composite/DEPENDENCIES b/ipojo/runtime/composite/DEPENDENCIES
similarity index 100%
rename from ipojo/composite/DEPENDENCIES
rename to ipojo/runtime/composite/DEPENDENCIES
diff --git a/ipojo/composite/LICENSE b/ipojo/runtime/composite/LICENSE
similarity index 100%
rename from ipojo/composite/LICENSE
rename to ipojo/runtime/composite/LICENSE
diff --git a/ipojo/composite/LICENSE.asm b/ipojo/runtime/composite/LICENSE.asm
similarity index 100%
rename from ipojo/composite/LICENSE.asm
rename to ipojo/runtime/composite/LICENSE.asm
diff --git a/ipojo/composite/NOTICE b/ipojo/runtime/composite/NOTICE
similarity index 100%
rename from ipojo/composite/NOTICE
rename to ipojo/runtime/composite/NOTICE
diff --git a/ipojo/composite/doc/changelog.txt b/ipojo/runtime/composite/doc/changelog.txt
similarity index 100%
rename from ipojo/composite/doc/changelog.txt
rename to ipojo/runtime/composite/doc/changelog.txt
diff --git a/ipojo/composite/obr.xml b/ipojo/runtime/composite/obr.xml
similarity index 100%
rename from ipojo/composite/obr.xml
rename to ipojo/runtime/composite/obr.xml
diff --git a/ipojo/composite/pom.xml b/ipojo/runtime/composite/pom.xml
similarity index 98%
rename from ipojo/composite/pom.xml
rename to ipojo/runtime/composite/pom.xml
index 8e50512..b4b7573 100644
--- a/ipojo/composite/pom.xml
+++ b/ipojo/runtime/composite/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <relativePath>../../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeFactory.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeHandler.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeInstanceDescription.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeManager.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeManager.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeManager.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeManager.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceDependencyHandler.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceImporter.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceImporter.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceImporter.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceImporter.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/POJOWriter.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/POJOWriter.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/POJOWriter.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/POJOWriter.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java
diff --git a/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/util/SourceManager.java b/ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/util/SourceManager.java
similarity index 100%
rename from ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/util/SourceManager.java
rename to ipojo/runtime/composite/src/main/java/org/apache/felix/ipojo/composite/util/SourceManager.java
diff --git a/ipojo/composite/src/main/resources/composite.xsd b/ipojo/runtime/composite/src/main/resources/composite.xsd
similarity index 100%
rename from ipojo/composite/src/main/resources/composite.xsd
rename to ipojo/runtime/composite/src/main/resources/composite.xsd
diff --git a/ipojo/composite/src/main/resources/metadata.xml b/ipojo/runtime/composite/src/main/resources/metadata.xml
similarity index 100%
rename from ipojo/composite/src/main/resources/metadata.xml
rename to ipojo/runtime/composite/src/main/resources/metadata.xml
diff --git a/ipojo/core/DEPENDENCIES b/ipojo/runtime/core/DEPENDENCIES
similarity index 100%
rename from ipojo/core/DEPENDENCIES
rename to ipojo/runtime/core/DEPENDENCIES
diff --git a/ipojo/core/LICENSE b/ipojo/runtime/core/LICENSE
similarity index 100%
rename from ipojo/core/LICENSE
rename to ipojo/runtime/core/LICENSE
diff --git a/ipojo/core/LICENSE.asm b/ipojo/runtime/core/LICENSE.asm
similarity index 100%
rename from ipojo/core/LICENSE.asm
rename to ipojo/runtime/core/LICENSE.asm
diff --git a/ipojo/core/NOTICE b/ipojo/runtime/core/NOTICE
similarity index 100%
rename from ipojo/core/NOTICE
rename to ipojo/runtime/core/NOTICE
diff --git a/ipojo/core/doc/apache-felix-ipojo.html b/ipojo/runtime/core/doc/apache-felix-ipojo.html
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo.html
rename to ipojo/runtime/core/doc/apache-felix-ipojo.html
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/apache.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/apache.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/apache.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/apache.png
Binary files differ
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/button.html b/ipojo/runtime/core/doc/apache-felix-ipojo_files/button.html
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/button.html
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/button.html
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/cog.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/cog.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/cog.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/cog.png
Binary files differ
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/footer.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/footer.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/footer.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/footer.png
Binary files differ
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/ga.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/ga.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/ga.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/ga.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/header.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/header.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/header.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/header.png
Binary files differ
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/hoverIntent.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/hoverIntent.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/hoverIntent.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/hoverIntent.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/ipojo.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/ipojo.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/ipojo.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/ipojo.png
Binary files differ
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/jquery-1.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/jquery-1.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/jquery-1.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/jquery-1.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/logo.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/logo.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/logo.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/logo.png
Binary files differ
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushCSharp.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushCSharp.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushCSharp.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushCSharp.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushDelphi.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushDelphi.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushDelphi.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushDelphi.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushJScript.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushJScript.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushJScript.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushJScript.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushJava.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushJava.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushJava.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushJava.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushPhp.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushPhp.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushPhp.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushPhp.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushPython.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushPython.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushPython.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushPython.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushShell.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushShell.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushShell.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushShell.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushSql.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushSql.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushSql.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushSql.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushVb.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushVb.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushVb.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushVb.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shBrushXml.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushXml.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shBrushXml.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shBrushXml.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/shCore.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/shCore.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/shCore.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/shCore.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/site.css b/ipojo/runtime/core/doc/apache-felix-ipojo_files/site.css
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/site.css
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/site.css
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/status_online.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/status_online.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/status_online.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/status_online.png
Binary files differ
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/superfish.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/superfish.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/superfish.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/superfish.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/supersubs.js b/ipojo/runtime/core/doc/apache-felix-ipojo_files/supersubs.js
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/supersubs.js
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/supersubs.js
diff --git a/ipojo/core/doc/apache-felix-ipojo_files/user_edit.png b/ipojo/runtime/core/doc/apache-felix-ipojo_files/user_edit.png
similarity index 100%
rename from ipojo/core/doc/apache-felix-ipojo_files/user_edit.png
rename to ipojo/runtime/core/doc/apache-felix-ipojo_files/user_edit.png
Binary files differ
diff --git a/ipojo/core/doc/changelog.txt b/ipojo/runtime/core/doc/changelog.txt
similarity index 100%
rename from ipojo/core/doc/changelog.txt
rename to ipojo/runtime/core/doc/changelog.txt
diff --git a/ipojo/core/obr.xml b/ipojo/runtime/core/obr.xml
similarity index 100%
rename from ipojo/core/obr.xml
rename to ipojo/runtime/core/obr.xml
diff --git a/ipojo/core/pom.xml b/ipojo/runtime/core/pom.xml
similarity index 99%
rename from ipojo/core/pom.xml
rename to ipojo/runtime/core/pom.xml
index acf5882..0169f41 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/runtime/core/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix-parent</artifactId>
     <version>1.2.1</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <relativePath>../../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentInstance.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ComponentInstance.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentInstance.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ComponentInstance.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ConfigurationException.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationException.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ConfigurationException.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConfigurationException.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ConstructorInjector.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConstructorInjector.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ConstructorInjector.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ConstructorInjector.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ContextListener.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ContextListener.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ContextListener.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ContextListener.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ContextSource.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ContextSource.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ContextSource.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ContextSource.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ErrorHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ErrorHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ErrorHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ErrorHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/EventDispatcher.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/Extender.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Extender.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/Extender.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Extender.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Factory.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Factory.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/FactoryStateListener.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/FactoryStateListener.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/FactoryStateListener.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/FactoryStateListener.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/FieldInterceptor.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/FieldInterceptor.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/FieldInterceptor.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/FieldInterceptor.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/Handler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Handler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/Handler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Handler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/HandlerFactory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerFactory.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/HandlerFactory.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerFactory.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/HandlerManager.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManager.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/HandlerManager.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManager.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/HandlerManagerFactory.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/IPOJOServiceFactory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPOJOServiceFactory.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/IPOJOServiceFactory.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPOJOServiceFactory.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/IPOJOURLHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPOJOURLHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/IPOJOURLHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPOJOURLHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoContext.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoContext.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoContext.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoContext.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/MethodInterceptor.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/MethodInterceptor.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/MethodInterceptor.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/MethodInterceptor.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/MissingHandlerException.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/MissingHandlerException.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/MissingHandlerException.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/MissingHandlerException.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/Nullable.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Nullable.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/Nullable.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Nullable.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/Pojo.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Pojo.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/Pojo.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/Pojo.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/PrimitiveInstanceDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveInstanceDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/PrimitiveInstanceDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/PrimitiveInstanceDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/ServiceContext.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ServiceContext.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/ServiceContext.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/ServiceContext.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/context/ServiceReferenceImpl.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/ServiceReferenceImpl.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/context/ServiceReferenceImpl.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/ServiceReferenceImpl.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistrationImpl.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistrationImpl.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistrationImpl.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistrationImpl.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistry.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistry.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistry.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/ServiceRegistry.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/context/StringMap.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/StringMap.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/context/StringMap.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/context/StringMap.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandlerDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableObject.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableObject.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableObject.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/NullableObject.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ProxyGenerator.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ProxyGenerator.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ProxyGenerator.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ProxyGenerator.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceCollection.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceCollection.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceCollection.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceCollection.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/controller/ControllerHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/controller/ControllerHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/controller/ControllerHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/controller/ControllerHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/CreationStrategy.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/CreationStrategy.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/CreationStrategy.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/CreationStrategy.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ConfigurableCreationStrategy.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ConfigurableCreationStrategy.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ConfigurableCreationStrategy.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ConfigurableCreationStrategy.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ErrorPrintingServiceFactoryProxy.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ErrorPrintingServiceFactoryProxy.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ErrorPrintingServiceFactoryProxy.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ErrorPrintingServiceFactoryProxy.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ServiceObjectFactory.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ServiceObjectFactory.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ServiceObjectFactory.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/strategy/ServiceObjectFactory.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseException.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/PojoMetadata.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/PojoMetadata.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/parser/PojoMetadata.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/parser/PojoMetadata.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Callback.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Callback.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyModel.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyStateListener.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyStateListener.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/DependencyStateListener.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/DependencyStateListener.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Logger.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Logger.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/Logger.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Logger.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Property.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/Property.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Property.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/SecurityHelper.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/SecurityHelper.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/SecurityHelper.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/SecurityHelper.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/ServiceReferenceRankingComparator.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/ServiceReferenceRankingComparator.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/ServiceReferenceRankingComparator.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/ServiceReferenceRankingComparator.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Tracker.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Tracker.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/Tracker.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/Tracker.java
diff --git a/ipojo/core/src/main/java/org/apache/felix/ipojo/util/TrackerCustomizer.java b/ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/TrackerCustomizer.java
similarity index 100%
rename from ipojo/core/src/main/java/org/apache/felix/ipojo/util/TrackerCustomizer.java
rename to ipojo/runtime/core/src/main/java/org/apache/felix/ipojo/util/TrackerCustomizer.java
diff --git a/ipojo/core/src/main/resources/core.xsd b/ipojo/runtime/core/src/main/resources/core.xsd
similarity index 100%
rename from ipojo/core/src/main/resources/core.xsd
rename to ipojo/runtime/core/src/main/resources/core.xsd
diff --git a/ipojo/core/src/main/resources/metadata.xml b/ipojo/runtime/core/src/main/resources/metadata.xml
similarity index 100%
rename from ipojo/core/src/main/resources/metadata.xml
rename to ipojo/runtime/core/src/main/resources/metadata.xml
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/dependency/SmartProxyTest.java
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithAnotherSuperClass.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithAnotherSuperClass.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithAnotherSuperClass.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithAnotherSuperClass.java
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithSuperClass.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithSuperClass.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithSuperClass.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ComponentTestWithSuperClass.java
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerTest.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerTest.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerTest.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerTest.java
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/parser/ManipulationMetadataTest.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/parser/ManipulationMetadataTest.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/parser/ManipulationMetadataTest.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/parser/ManipulationMetadataTest.java
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/parser/PojoMetadataTest.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/parser/PojoMetadataTest.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/parser/PojoMetadataTest.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/parser/PojoMetadataTest.java
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/test/MockBundle.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/test/MockBundle.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/test/MockBundle.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/test/MockBundle.java
diff --git a/ipojo/core/src/test/java/org/apache/felix/ipojo/util/ManifestMetadataParserTest.java b/ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/util/ManifestMetadataParserTest.java
similarity index 100%
rename from ipojo/core/src/test/java/org/apache/felix/ipojo/util/ManifestMetadataParserTest.java
rename to ipojo/runtime/core/src/test/java/org/apache/felix/ipojo/util/ManifestMetadataParserTest.java
diff --git a/ipojo/core/src/test/resources/manipulation/MANIFEST.MF b/ipojo/runtime/core/src/test/resources/manipulation/MANIFEST.MF
similarity index 100%
rename from ipojo/core/src/test/resources/manipulation/MANIFEST.MF
rename to ipojo/runtime/core/src/test/resources/manipulation/MANIFEST.MF
diff --git a/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml b/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml
new file mode 100644
index 0000000..b4692a3
--- /dev/null
+++ b/ipojo/runtime/org.apache.felix.ipojo.runtime-project.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.easymock:easymock:2.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-all:1.7" level="project" />
+  </component>
+</module>
+
diff --git a/ipojo/runtime/pom.xml b/ipojo/runtime/pom.xml
new file mode 100644
index 0000000..07c3eca
--- /dev/null
+++ b/ipojo/runtime/pom.xml
@@ -0,0 +1,120 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<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/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>felix-parent</artifactId>
+        <version>1.2.1</version>
+        <relativePath>../../pom/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.apache.felix.ipojo.runtime-project</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <name>Apache Felix iPOJO Runtime Project</name>
+    <packaging>pom</packaging>
+
+    <description>
+        The iPOJO runtime project contains the core iPOJO bundle, the composite support and the annotations.
+    </description>
+
+    <modules>
+        <module>core</module>
+        <module>composite</module>
+        <module>annotations</module>
+    </modules>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE*</include>
+                    <include>NOTICE*</include>
+                    <include>DEPENDENCIES*</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptorRefs>
+                                        <descriptorRef>project</descriptorRef>
+                                    </descriptorRefs>
+                                    <!-- we don't want to attach all the assemblies, such as bz2 -->
+                                    <attach>false</attach>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <!-- only attach the project and bin assemblies, in tar.gz and zip flavors -->
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-assemblies</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>attach-artifact</goal>
+                                </goals>
+                                <configuration>
+                                    <artifacts>
+                                        <artifact>
+                                            <file>
+                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.tar.gz
+                                            </file>
+                                            <classifier>project</classifier>
+                                            <type>tar.gz</type>
+                                        </artifact>
+                                        <artifact>
+                                            <file>
+                                                ${project.build.directory}/${project.artifactId}-${project.version}-project.zip
+                                            </file>
+                                            <classifier>project</classifier>
+                                            <type>zip</type>
+                                        </artifact>
+                                    </artifacts>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>