diff --git a/.gitignore b/.gitignore
index a82f9d7..d2e42ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 
 # maven
 target/
-*/src/main/java/
+java/
 
 # common junk
 *.log
diff --git a/javax.servlet.jsp/2.2.0.v201112011158/pom.xml b/javax.servlet.jsp/2.2.0.v201112011158/pom.xml
index d387ea4..6f1364b 100644
--- a/javax.servlet.jsp/2.2.0.v201112011158/pom.xml
+++ b/javax.servlet.jsp/2.2.0.v201112011158/pom.xml
@@ -2,12 +2,23 @@
   <parent>
     <groupId>org.eclipse.jetty.orbit</groupId>
     <artifactId>jetty-orbit</artifactId>
-    <version>1-SNAPSHOT</version>
+    <version>2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.orbit</groupId>
   <artifactId>javax.servlet.jsp</artifactId>
   <version>2.2.0.v201112011158</version>
   <name>Jetty Orbit :: JSP API</name>
+  <description>
+    This artifact originates from the Orbit Project at Eclipse, 
+    it is an osgi bundle and is signed as well.
+  </description>
   <packaging>orbit</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <version>3.0.0.v201112011016</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/javax.servlet/3.0.0.v201112011016/pom.xml b/javax.servlet/3.0.0.v201112011016/pom.xml
index 037051b..f9f0dcb 100644
--- a/javax.servlet/3.0.0.v201112011016/pom.xml
+++ b/javax.servlet/3.0.0.v201112011016/pom.xml
@@ -2,12 +2,16 @@
   <parent>
     <groupId>org.eclipse.jetty.orbit</groupId>
     <artifactId>jetty-orbit</artifactId>
-    <version>1-SNAPSHOT</version>
+    <version>2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.orbit</groupId>
   <artifactId>javax.servlet</artifactId>
   <version>3.0.0.v201112011016</version>
   <name>Jetty Orbit :: Servlet API</name>
+  <description>
+    This artifact originates from the Orbit Project at Eclipse, 
+    it is an osgi bundle and is signed as well.
+  </description>
   <packaging>orbit</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/jetty-orbit/pom.xml b/jetty-orbit/pom.xml
index 94a12bd..eadae67 100644
--- a/jetty-orbit/pom.xml
+++ b/jetty-orbit/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
 		<groupId>org.eclipse.jetty</groupId>
 		<artifactId>jetty-parent</artifactId>
@@ -44,5 +45,23 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<configuration>
+						<filesets>
+							<fileset>
+								<directory>src/main/java</directory>
+								<includes>
+									<include>**/**</include>
+								</includes>
+							</fileset>
+						</filesets>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 </project>
diff --git a/org.apache.jasper.glassfish/pom.xml b/org.apache.jasper.glassfish/pom.xml
deleted file mode 100644
index bbc5ec8..0000000
--- a/org.apache.jasper.glassfish/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.eclipse.jetty.orbit</groupId>
-    <artifactId>jetty-orbit</artifactId>
-    <version>1-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.jetty.orbit</groupId>
-  <artifactId>org.apache.jasper.glassfish</artifactId>
-  <version>2.2.2.v201112011158</version>
-  <name>Jetty Orbit :: Servlet API</name>
-  <packaging>orbit</packaging>
-</project>
diff --git a/org.apache.jasper.glassfish/src/main/artifacts/org.apache.jasper.glassfish.source_2.2.2.v201112011158.jar b/org.apache.jasper.glassfish/src/main/artifacts/org.apache.jasper.glassfish.source_2.2.2.v201112011158.jar
deleted file mode 100644
index 0afc8f2..0000000
--- a/org.apache.jasper.glassfish/src/main/artifacts/org.apache.jasper.glassfish.source_2.2.2.v201112011158.jar
+++ /dev/null
Binary files differ
diff --git a/org.apache.jasper.glassfish/src/main/artifacts/org.apache.jasper.glassfish_2.2.2.v201112011158.jar b/org.apache.jasper.glassfish/src/main/artifacts/org.apache.jasper.glassfish_2.2.2.v201112011158.jar
deleted file mode 100644
index 8415c70..0000000
--- a/org.apache.jasper.glassfish/src/main/artifacts/org.apache.jasper.glassfish_2.2.2.v201112011158.jar
+++ /dev/null
Binary files differ