diff --git a/pom.xml b/pom.xml
index 208c291..99dbb3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@ See the Apache License Version 2.0 for the specific language governing permissio
   </parent>
 
   <artifactId>plexus-build-api</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
 
   <scm>
     <connection>scm:git:https://github.com/codehaus-plexus/plexus-build-api.git</connection>
diff --git a/src/main/java/org/sonatype/plexus/build/incremental/BuildContext.java b/src/main/java/org/codehaus/plexus/build/BuildContext.java
similarity index 99%
rename from src/main/java/org/sonatype/plexus/build/incremental/BuildContext.java
rename to src/main/java/org/codehaus/plexus/build/BuildContext.java
index 285acfa..48fee34 100644
--- a/src/main/java/org/sonatype/plexus/build/incremental/BuildContext.java
+++ b/src/main/java/org/codehaus/plexus/build/BuildContext.java
@@ -10,7 +10,7 @@
 "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
 See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
 */
-package org.sonatype.plexus.build.incremental;
+package org.codehaus.plexus.build;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java b/src/main/java/org/codehaus/plexus/build/DefaultBuildContext.java
similarity index 97%
rename from src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java
rename to src/main/java/org/codehaus/plexus/build/DefaultBuildContext.java
index 93a5e52..049ae0e 100644
--- a/src/main/java/org/sonatype/plexus/build/incremental/DefaultBuildContext.java
+++ b/src/main/java/org/codehaus/plexus/build/DefaultBuildContext.java
@@ -11,15 +11,15 @@
 See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
 */
 
-package org.sonatype.plexus.build.incremental;
+package org.codehaus.plexus.build;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.List;
 
 import org.codehaus.plexus.util.DirectoryScanner;
@@ -69,7 +69,7 @@ public boolean hasDelta(List<String> relpaths) {
 
   /** {@inheritDoc} */
   public OutputStream newFileOutputStream(File file) throws IOException {
-    return new FileOutputStream(file);
+    return Files.newOutputStream(file.toPath());
   }
 
   /** {@inheritDoc} */
diff --git a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java b/src/main/java/org/codehaus/plexus/build/EmptyScanner.java
similarity index 97%
rename from src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
rename to src/main/java/org/codehaus/plexus/build/EmptyScanner.java
index 52838a3..106b9d9 100644
--- a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java
+++ b/src/main/java/org/codehaus/plexus/build/EmptyScanner.java
@@ -11,7 +11,7 @@
 See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
 */
 
-package org.sonatype.plexus.build.incremental;
+package org.codehaus.plexus.build;
 
 import java.io.File;
 import java.util.Comparator;
diff --git a/src/main/java/org/sonatype/plexus/build/incremental/ThreadBuildContext.java b/src/main/java/org/codehaus/plexus/build/ThreadBuildContext.java
similarity index 89%
rename from src/main/java/org/sonatype/plexus/build/incremental/ThreadBuildContext.java
rename to src/main/java/org/codehaus/plexus/build/ThreadBuildContext.java
index ec19717..24a92cc 100644
--- a/src/main/java/org/sonatype/plexus/build/incremental/ThreadBuildContext.java
+++ b/src/main/java/org/codehaus/plexus/build/ThreadBuildContext.java
@@ -11,7 +11,7 @@
 See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
 */
 
-package org.sonatype.plexus.build.incremental;
+package org.codehaus.plexus.build;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,7 +23,7 @@
 /**
  * BuildContext implementation that delegates actual work to thread-local
  * build context set using {@link #setThreadBuildContext(BuildContext)}.
- * {@link org.sonatype.plexus.build.incremental.DefaultBuildContext} is used if no thread local build context was set.
+ * {@link DefaultBuildContext} is used if no thread local build context was set.
  *
  * Note that plexus component metadata is not generated for this implementation.
  * Apparently, older version of plexus used by maven-filtering and likely
@@ -47,7 +47,7 @@ protected BuildContext initialValue() {
   /**
    * <p>getContext.</p>
    *
-   * @return a {@link org.sonatype.plexus.build.incremental.BuildContext} object.
+   * @return a {@link BuildContext} object.
    */
   public static BuildContext getContext() {
     return threadContext.get();
@@ -56,7 +56,7 @@ public static BuildContext getContext() {
   /**
    * <p>setThreadBuildContext.</p>
    *
-   * @param context a {@link org.sonatype.plexus.build.incremental.BuildContext} object.
+   * @param context a {@link BuildContext} object.
    */
   public static void setThreadBuildContext(BuildContext context) {
     threadContext.set(context);
@@ -143,12 +143,12 @@ public void removeMessages(File file) {
 
   /** {@inheritDoc} */
   public void addWarning(File file, int line, int column, String message, Throwable cause) {
-    addMessage(file, line, column, message, BuildContext.SEVERITY_WARNING, cause);
+    addMessage(file, line, column, message, SEVERITY_WARNING, cause);
   }
 
   /** {@inheritDoc} */
   public void addError(File file, int line, int column, String message, Throwable cause) {
-    addMessage(file, line, column, message, BuildContext.SEVERITY_ERROR, cause);
+    addMessage(file, line, column, message, SEVERITY_ERROR, cause);
   }
 
   /** {@inheritDoc} */
diff --git a/src/main/resources/org/sonatype/plexus/build/incremental/version.properties b/src/main/resources/org/codehaus/plexus/build/version.properties
similarity index 100%
rename from src/main/resources/org/sonatype/plexus/build/incremental/version.properties
rename to src/main/resources/org/codehaus/plexus/build/version.properties
diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestFullBuildContext.java b/src/test/java/org/codehaus/plexus/build/test/TestFullBuildContext.java
similarity index 89%
rename from src/test/java/org/sonatype/plexus/build/incremental/test/TestFullBuildContext.java
rename to src/test/java/org/codehaus/plexus/build/test/TestFullBuildContext.java
index 00e602c..be30fe9 100644
--- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestFullBuildContext.java
+++ b/src/test/java/org/codehaus/plexus/build/test/TestFullBuildContext.java
@@ -11,11 +11,11 @@
 See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
 */
 
-package org.sonatype.plexus.build.incremental.test;
+package org.codehaus.plexus.build.test;
 
 import java.util.Map;
 
-import org.sonatype.plexus.build.incremental.DefaultBuildContext;
+import org.codehaus.plexus.build.DefaultBuildContext;
 
 
 public class TestFullBuildContext extends DefaultBuildContext {
diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java b/src/test/java/org/codehaus/plexus/build/test/TestIncrementalBuildContext.java
similarity index 96%
rename from src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
rename to src/test/java/org/codehaus/plexus/build/test/TestIncrementalBuildContext.java
index fea2f91..2779d31 100644
--- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java
+++ b/src/test/java/org/codehaus/plexus/build/test/TestIncrementalBuildContext.java
@@ -11,7 +11,7 @@
 See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
 */
 
-package org.sonatype.plexus.build.incremental.test;
+package org.codehaus.plexus.build.test;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -25,9 +25,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.codehaus.plexus.build.BuildContext;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.Scanner;
-import org.sonatype.plexus.build.incremental.BuildContext;
 
 public class TestIncrementalBuildContext implements BuildContext {
 
@@ -52,7 +52,7 @@ public String[] getIncludedDirectories() {
     }
 
     public String[] getIncludedFiles() {
-      return (String[]) files.toArray(new String[files.size()]);
+      return (String[]) files.toArray(new String[0]);
     }
 
     public void scan() {