diff --git a/deploymentadmin/pom.xml b/deploymentadmin/pom.xml
index 4be5396..3dc0c07 100644
--- a/deploymentadmin/pom.xml
+++ b/deploymentadmin/pom.xml
@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
+<!-- 
+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
+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.
+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>
   <parent>
@@ -25,49 +24,11 @@
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix Deployment Admin</name>
-  <version>0.9.0-SNAPSHOT</version>
-  <artifactId>org.apache.felix.deploymentadmin</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>1.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>1.0.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.dependencymanager</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.felix.deploymentadmin</Bundle-SymbolicName>
-            <Bundle-Activator>org.apache.felix.deploymentadmin.Activator</Bundle-Activator>
-            <Bundle-Name>Apache Felix Deployment Admin</Bundle-Name>
-            <Bundle-Description>A bundle that implements the Deployment Admin.</Bundle-Description>
-            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-            <Private-Package>org.apache.felix.deploymentadmin.spi</Private-Package>
-            <Export-Package>org.apache.felix.deploymentadmin,org.osgi.service.deploymentadmin.*;version="1.0.0"</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <packaging>pom</packaging>
+  <name>Apache Felix Deployment Projects</name>
+  <artifactId>deployment-build</artifactId>
+  <version>1</version>
+  <modules>
+      <module>service</module>
+  </modules>
 </project>
diff --git a/deploymentadmin/LICENSE b/deploymentadmin/service/LICENSE
similarity index 100%
rename from deploymentadmin/LICENSE
rename to deploymentadmin/service/LICENSE
diff --git a/deploymentadmin/NOTICE b/deploymentadmin/service/NOTICE
similarity index 100%
rename from deploymentadmin/NOTICE
rename to deploymentadmin/service/NOTICE
diff --git a/deploymentadmin/service/pom.xml b/deploymentadmin/service/pom.xml
new file mode 100644
index 0000000..4be5396
--- /dev/null
+++ b/deploymentadmin/service/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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>
+  <parent>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>felix</artifactId>
+    <version>1.0.2</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>bundle</packaging>
+  <name>Apache Felix Deployment Admin</name>
+  <version>0.9.0-SNAPSHOT</version>
+  <artifactId>org.apache.felix.deploymentadmin</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>1.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>1.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.4.0</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>org.apache.felix.deploymentadmin</Bundle-SymbolicName>
+            <Bundle-Activator>org.apache.felix.deploymentadmin.Activator</Bundle-Activator>
+            <Bundle-Name>Apache Felix Deployment Admin</Bundle-Name>
+            <Bundle-Description>A bundle that implements the Deployment Admin.</Bundle-Description>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+            <Private-Package>org.apache.felix.deploymentadmin.spi</Private-Package>
+            <Export-Package>org.apache.felix.deploymentadmin,org.osgi.service.deploymentadmin.*;version="1.0.0"</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/AbstractDeploymentPackage.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/AbstractDeploymentPackage.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/AbstractDeploymentPackage.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/AbstractDeploymentPackage.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/AbstractInfo.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/AbstractInfo.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/AbstractInfo.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/AbstractInfo.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/Activator.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Activator.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/Activator.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Activator.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/BundleInfoImpl.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/BundleInfoImpl.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/BundleInfoImpl.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/BundleInfoImpl.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/Constants.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Constants.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/Constants.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Constants.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentAdminImpl.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/DeploymentPackageManifest.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentPackageManifest.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/DeploymentPackageManifest.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/DeploymentPackageManifest.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/ExplodingOutputtingInputStream.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/FileDeploymentPackage.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/FileDeploymentPackage.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/FileDeploymentPackage.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/FileDeploymentPackage.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/NonCloseableStream.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/NonCloseableStream.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/NonCloseableStream.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/NonCloseableStream.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/OutputtingInputStream.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/OutputtingInputStream.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/OutputtingInputStream.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/OutputtingInputStream.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ResourceInfoImpl.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/ResourceInfoImpl.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/ResourceInfoImpl.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/ResourceInfoImpl.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/Semaphore.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Semaphore.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/Semaphore.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/Semaphore.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/StreamDeploymentPackage.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/StreamDeploymentPackage.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/StreamDeploymentPackage.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/StreamDeploymentPackage.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/VersionRange.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/VersionRange.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/VersionRange.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/VersionRange.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/Command.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/Command.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/Command.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/Command.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/CommitResourceCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/CommitResourceCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/CommitResourceCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/CommitResourceCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DeploymentSessionImpl.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/DeploymentSessionImpl.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DeploymentSessionImpl.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/DeploymentSessionImpl.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/DropBundleCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropResourceCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/DropResourceCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/DropResourceCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/DropResourceCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/GetStorageAreaCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/GetStorageAreaCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/GetStorageAreaCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/GetStorageAreaCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/ProcessResourceCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/SnapshotCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/SnapshotCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/SnapshotCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/SnapshotCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/StartBundleCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartCustomizerCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/StartCustomizerCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StartCustomizerCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/StartCustomizerCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/StopBundleCommand.java
diff --git a/deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/UpdateCommand.java b/deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/UpdateCommand.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/apache/felix/deploymentadmin/spi/UpdateCommand.java
rename to deploymentadmin/service/src/main/java/org/apache/felix/deploymentadmin/spi/UpdateCommand.java
diff --git a/deploymentadmin/src/main/java/org/osgi/application/ApplicationContext.java b/deploymentadmin/service/src/main/java/org/osgi/application/ApplicationContext.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/application/ApplicationContext.java
rename to deploymentadmin/service/src/main/java/org/osgi/application/ApplicationContext.java
diff --git a/deploymentadmin/src/main/java/org/osgi/application/ApplicationServiceEvent.java b/deploymentadmin/service/src/main/java/org/osgi/application/ApplicationServiceEvent.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/application/ApplicationServiceEvent.java
rename to deploymentadmin/service/src/main/java/org/osgi/application/ApplicationServiceEvent.java
diff --git a/deploymentadmin/src/main/java/org/osgi/application/ApplicationServiceListener.java b/deploymentadmin/service/src/main/java/org/osgi/application/ApplicationServiceListener.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/application/ApplicationServiceListener.java
rename to deploymentadmin/service/src/main/java/org/osgi/application/ApplicationServiceListener.java
diff --git a/deploymentadmin/src/main/java/org/osgi/application/Framework.java b/deploymentadmin/service/src/main/java/org/osgi/application/Framework.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/application/Framework.java
rename to deploymentadmin/service/src/main/java/org/osgi/application/Framework.java
diff --git a/deploymentadmin/src/main/java/org/osgi/application/package.html b/deploymentadmin/service/src/main/java/org/osgi/application/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/application/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/application/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/application/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/application/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/application/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/application/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/application/ApplicationAdminPermission.java b/deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationAdminPermission.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/application/ApplicationAdminPermission.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationAdminPermission.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/application/ApplicationDescriptor.java b/deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationDescriptor.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/application/ApplicationDescriptor.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationDescriptor.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/application/ApplicationException.java b/deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationException.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/application/ApplicationException.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationException.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/application/ApplicationHandle.java b/deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationHandle.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/application/ApplicationHandle.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/application/ApplicationHandle.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/application/ScheduledApplication.java b/deploymentadmin/service/src/main/java/org/osgi/service/application/ScheduledApplication.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/application/ScheduledApplication.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/application/ScheduledApplication.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/application/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/application/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/application/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/application/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/application/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/application/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/application/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/application/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/Configuration.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/Configuration.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/Configuration.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/Configuration.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationEvent.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationException.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationException.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationException.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationException.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationListener.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationListener.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationListener.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationListener.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationPermission.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ManagedService.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ManagedService.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ManagedService.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ManagedService.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java b/deploymentadmin/service/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/cm/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/cm/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/cm/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/cm/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/cm/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/component/ComponentConstants.java b/deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentConstants.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/component/ComponentConstants.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentConstants.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/component/ComponentContext.java b/deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentContext.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/component/ComponentContext.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentContext.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/component/ComponentException.java b/deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentException.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/component/ComponentException.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentException.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/component/ComponentFactory.java b/deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentFactory.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/component/ComponentFactory.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentFactory.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/component/ComponentInstance.java b/deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentInstance.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/component/ComponentInstance.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/component/ComponentInstance.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/component/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/component/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/component/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/component/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/component/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/component/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/component/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/component/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/BundleInfo.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/BundleInfo.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/BundleInfo.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/BundleInfo.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdmin.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdmin.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdmin.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdmin.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdminPermission.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdminPermission.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdminPermission.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentAdminPermission.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentException.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentException.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentException.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentException.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentPackage.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentPackage.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/DeploymentPackage.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/DeploymentPackage.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentCustomizerPermission.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentCustomizerPermission.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentCustomizerPermission.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentCustomizerPermission.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentSession.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentSession.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentSession.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/DeploymentSession.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessor.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessor.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessor.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessor.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessorException.java b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessorException.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessorException.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/ResourceProcessorException.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/deploymentadmin/spi/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/deploymentadmin/spi/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/event/Event.java b/deploymentadmin/service/src/main/java/org/osgi/service/event/Event.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/event/Event.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/event/Event.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/event/EventAdmin.java b/deploymentadmin/service/src/main/java/org/osgi/service/event/EventAdmin.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/event/EventAdmin.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/event/EventAdmin.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/event/EventConstants.java b/deploymentadmin/service/src/main/java/org/osgi/service/event/EventConstants.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/event/EventConstants.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/event/EventConstants.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/event/EventHandler.java b/deploymentadmin/service/src/main/java/org/osgi/service/event/EventHandler.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/event/EventHandler.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/event/EventHandler.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/event/TopicPermission.java b/deploymentadmin/service/src/main/java/org/osgi/service/event/TopicPermission.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/event/TopicPermission.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/event/TopicPermission.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/event/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/event/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/event/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/event/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/event/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/event/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/event/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/event/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/io/ConnectionFactory.java b/deploymentadmin/service/src/main/java/org/osgi/service/io/ConnectionFactory.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/io/ConnectionFactory.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/io/ConnectionFactory.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/io/ConnectorService.java b/deploymentadmin/service/src/main/java/org/osgi/service/io/ConnectorService.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/io/ConnectorService.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/io/ConnectorService.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/io/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/io/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/io/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/io/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/io/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/io/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/io/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/io/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/log/LogEntry.java b/deploymentadmin/service/src/main/java/org/osgi/service/log/LogEntry.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/log/LogEntry.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/log/LogEntry.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/log/LogListener.java b/deploymentadmin/service/src/main/java/org/osgi/service/log/LogListener.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/log/LogListener.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/log/LogListener.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/log/LogReaderService.java b/deploymentadmin/service/src/main/java/org/osgi/service/log/LogReaderService.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/log/LogReaderService.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/log/LogReaderService.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/log/LogService.java b/deploymentadmin/service/src/main/java/org/osgi/service/log/LogService.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/log/LogService.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/log/LogService.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/log/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/log/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/log/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/log/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/log/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/log/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/log/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/log/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/metatype/AttributeDefinition.java b/deploymentadmin/service/src/main/java/org/osgi/service/metatype/AttributeDefinition.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/metatype/AttributeDefinition.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/metatype/AttributeDefinition.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java b/deploymentadmin/service/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/metatype/MetaTypeInformation.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java b/deploymentadmin/service/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/metatype/MetaTypeProvider.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/metatype/MetaTypeService.java b/deploymentadmin/service/src/main/java/org/osgi/service/metatype/MetaTypeService.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/metatype/MetaTypeService.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/metatype/MetaTypeService.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java b/deploymentadmin/service/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/metatype/ObjectClassDefinition.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/metatype/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/metatype/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/metatype/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/metatype/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/metatype/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/metatype/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/metatype/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/metatype/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/MonitorAdmin.java b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitorAdmin.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/MonitorAdmin.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitorAdmin.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/MonitorListener.java b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitorListener.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/MonitorListener.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitorListener.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/MonitorPermission.java b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitorPermission.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/MonitorPermission.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitorPermission.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/Monitorable.java b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/Monitorable.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/Monitorable.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/Monitorable.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/MonitoringJob.java b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitoringJob.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/MonitoringJob.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/MonitoringJob.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/StatusVariable.java b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/StatusVariable.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/StatusVariable.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/StatusVariable.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/monitor/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/monitor/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/monitor/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/monitor/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/service/prefs/BackingStoreException.java b/deploymentadmin/service/src/main/java/org/osgi/service/prefs/BackingStoreException.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/prefs/BackingStoreException.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/prefs/BackingStoreException.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/prefs/Preferences.java b/deploymentadmin/service/src/main/java/org/osgi/service/prefs/Preferences.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/prefs/Preferences.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/prefs/Preferences.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/prefs/PreferencesService.java b/deploymentadmin/service/src/main/java/org/osgi/service/prefs/PreferencesService.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/prefs/PreferencesService.java
rename to deploymentadmin/service/src/main/java/org/osgi/service/prefs/PreferencesService.java
diff --git a/deploymentadmin/src/main/java/org/osgi/service/prefs/package.html b/deploymentadmin/service/src/main/java/org/osgi/service/prefs/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/prefs/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/service/prefs/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/service/prefs/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/service/prefs/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/service/prefs/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/service/prefs/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/util/gsm/IMEICondition.java b/deploymentadmin/service/src/main/java/org/osgi/util/gsm/IMEICondition.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/gsm/IMEICondition.java
rename to deploymentadmin/service/src/main/java/org/osgi/util/gsm/IMEICondition.java
diff --git a/deploymentadmin/src/main/java/org/osgi/util/gsm/IMSICondition.java b/deploymentadmin/service/src/main/java/org/osgi/util/gsm/IMSICondition.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/gsm/IMSICondition.java
rename to deploymentadmin/service/src/main/java/org/osgi/util/gsm/IMSICondition.java
diff --git a/deploymentadmin/src/main/java/org/osgi/util/gsm/package.html b/deploymentadmin/service/src/main/java/org/osgi/util/gsm/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/gsm/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/util/gsm/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/util/gsm/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/util/gsm/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/gsm/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/util/gsm/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/util/mobile/UserPromptCondition.java b/deploymentadmin/service/src/main/java/org/osgi/util/mobile/UserPromptCondition.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/mobile/UserPromptCondition.java
rename to deploymentadmin/service/src/main/java/org/osgi/util/mobile/UserPromptCondition.java
diff --git a/deploymentadmin/src/main/java/org/osgi/util/mobile/package.html b/deploymentadmin/service/src/main/java/org/osgi/util/mobile/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/mobile/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/util/mobile/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/util/mobile/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/util/mobile/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/mobile/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/util/mobile/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/util/tracker/ServiceTracker.java b/deploymentadmin/service/src/main/java/org/osgi/util/tracker/ServiceTracker.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/tracker/ServiceTracker.java
rename to deploymentadmin/service/src/main/java/org/osgi/util/tracker/ServiceTracker.java
diff --git a/deploymentadmin/src/main/java/org/osgi/util/tracker/ServiceTrackerCustomizer.java b/deploymentadmin/service/src/main/java/org/osgi/util/tracker/ServiceTrackerCustomizer.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/tracker/ServiceTrackerCustomizer.java
rename to deploymentadmin/service/src/main/java/org/osgi/util/tracker/ServiceTrackerCustomizer.java
diff --git a/deploymentadmin/src/main/java/org/osgi/util/tracker/package.html b/deploymentadmin/service/src/main/java/org/osgi/util/tracker/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/tracker/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/util/tracker/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/util/tracker/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/util/tracker/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/tracker/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/util/tracker/packageinfo
diff --git a/deploymentadmin/src/main/java/org/osgi/util/xml/XMLParserActivator.java b/deploymentadmin/service/src/main/java/org/osgi/util/xml/XMLParserActivator.java
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/xml/XMLParserActivator.java
rename to deploymentadmin/service/src/main/java/org/osgi/util/xml/XMLParserActivator.java
diff --git a/deploymentadmin/src/main/java/org/osgi/util/xml/package.html b/deploymentadmin/service/src/main/java/org/osgi/util/xml/package.html
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/xml/package.html
rename to deploymentadmin/service/src/main/java/org/osgi/util/xml/package.html
diff --git a/deploymentadmin/src/main/java/org/osgi/util/xml/packageinfo b/deploymentadmin/service/src/main/java/org/osgi/util/xml/packageinfo
similarity index 100%
rename from deploymentadmin/src/main/java/org/osgi/util/xml/packageinfo
rename to deploymentadmin/service/src/main/java/org/osgi/util/xml/packageinfo