diff --git a/jetty-setuid/jetty-setuid-linux/pom.xml b/jetty-setuid/jetty-setuid-linux/pom.xml
deleted file mode 100644
index 06552ad383c..00000000000
--- a/jetty-setuid/jetty-setuid-linux/pom.xml
+++ /dev/null
@@ -1,133 +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.setuid</groupId>
-        <artifactId>jetty-setuid-parent</artifactId>
-        <version>9.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jetty-setuid-linux</artifactId>
-    <name>Jetty :: SetUID Linux Native</name>
-    <packaging>so</packaging>
-		<properties>
-			<native-source-dir>target/native</native-source-dir>
-      <jetty-setuid-linkerStartOption>-shared -lc -ldl-shared -lc -ldl</jetty-setuid-linkerStartOption>
-      <jetty-setuid-linkerEndOption>target/libsetuid.so</jetty-setuid-linkerEndOption>
-		</properties>
-    <build>
-        <finalName>libsetuid</finalName>
-        <plugins>
-		      <plugin>
-		        <artifactId>maven-dependency-plugin</artifactId>
-		        <executions>
-		          <execution>
-		            <id>unpack</id>
-		            <phase>generate-resources</phase>
-		            <goals>
-		              <goal>unpack</goal>
-		            </goals>
-		            <configuration>
-		              <artifactItems>
-		                <artifactItem>
-		                  <groupId>org.eclipse.jetty.setuid</groupId>
-		                  <artifactId>jetty-setuid-native</artifactId>
-		                  <version>${project.version}</version>
-		                  <overWrite>true</overWrite>
-		                  <outputDirectory>${native-source-dir}/</outputDirectory>
-		                </artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-						
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-jni-implementation</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy failonerror="false" file="${native-source-dir}/org_eclipse_jetty_setuid_SetUID.c" todir="target/generated" />
-
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>native-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <javahOS>mac</javahOS>
-										<jdkIncludePath>${java.home}/include</jdkIncludePath>
-                    <compilerStartOptions>
-                        <compilerStartOption>-fPIC -O</compilerStartOption>
-                    </compilerStartOptions>
-                    <sources>
-                        <source>
-                            <directory>target/generated</directory>
-                            <fileNames>
-                                
-<fileName>org_mortbay_setuid_SetUID.c</fileName>
-                            </fileNames>
-                        </source>
-                    </sources>
-                    <linkerStartOptions>
-                        
-<linkerStartOption>${jetty-setuid-linkerStartOption}</linkerStartOption>
-                    </linkerStartOptions>
-                    <linkerEndOptions>
-                        <linkerEndOptions>-o 
-${project.build.directory}/libsetuid.so</linkerEndOptions>
-                    </linkerEndOptions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>javah</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <classNames>
-                                
-<className>org.eclipse.jetty.setuid.SetUID</className>
-                            </classNames>
-                            
-<outputDirectory>target/generated</outputDirectory>
-                        </configuration>
-                        <goals>
-                            <goal>javah</goal>
-                        </goals>
-                    </execution>
-
-                    <execution>
-                        <id>compile</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-        
-
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-          <groupId>org.eclipse.jetty.setuid</groupId>
-          <artifactId>jetty-setuid-java</artifactId>
-          <version>${project.version}</version>
-        </dependency>     
-        <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/jetty-setuid/libsetuid_linux/pom.xml b/jetty-setuid/libsetuid_linux/pom.xml
new file mode 100644
index 00000000000..0a721973aa1
--- /dev/null
+++ b/jetty-setuid/libsetuid_linux/pom.xml
@@ -0,0 +1,136 @@
+<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.setuid</groupId>
+    <artifactId>jetty-setuid-parent</artifactId>
+    <version>9.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>libsetuid_linux</artifactId>
+  <name>Jetty :: SetUID Linux Native</name>
+  <packaging>so</packaging>
+  <properties>
+    <native-source-dir>target/native</native-source-dir>
+    <jetty-setuid-linkerStartOption>-shared -lc -ldl-shared -lc -ldl</jetty-setuid-linkerStartOption>
+    <jetty-setuid-linkerEndOption>target/libsetuid_linux.so</jetty-setuid-linkerEndOption>
+  </properties>
+  <build>
+    <finalName>libsetuid_linux</finalName>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty.setuid</groupId>
+                  <artifactId>jetty-setuid-native</artifactId>
+                  <version>${project.version}</version>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${native-source-dir}/</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-jni-implementation</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <copy failonerror="false"
+                  file="${native-source-dir}/org_eclipse_jetty_setuid_SetUID.c"
+                  todir="target/generated" />
+
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>native-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <javahOS>mac</javahOS>
+          <jdkIncludePath>${java.home}/include</jdkIncludePath>
+          <compilerStartOptions>
+            <compilerStartOption>-fPIC -O</compilerStartOption>
+          </compilerStartOptions>
+          <sources>
+            <source>
+              <directory>target/generated</directory>
+              <fileNames>
+
+                <fileName>org_eclipse_jetty_setuid_SetUID.c</fileName>
+              </fileNames>
+            </source>
+          </sources>
+          <linkerStartOptions>
+
+            <linkerStartOption>${jetty-setuid-linkerStartOption}</linkerStartOption>
+          </linkerStartOptions>
+          <linkerEndOptions>
+            <linkerEndOptions>-o
+              ${project.build.directory}/libsetuid.so</linkerEndOptions>
+          </linkerEndOptions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>javah</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <classNames>
+
+                <className>org.eclipse.jetty.setuid.SetUID</className>
+              </classNames>
+
+              <outputDirectory>target/generated</outputDirectory>
+            </configuration>
+            <goals>
+              <goal>javah</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>compile</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+
+
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.setuid</groupId>
+      <artifactId>jetty-setuid-java</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/jetty-setuid/jetty-setuid-osx/pom.xml b/jetty-setuid/libsetuid_osx/pom.xml
similarity index 100%
rename from jetty-setuid/jetty-setuid-osx/pom.xml
rename to jetty-setuid/libsetuid_osx/pom.xml