diff --git a/app/current/src/main/scala/io/scalajs/nodejs/fs/Fs.scala b/app/nodejs_v8/src/main/scala/io/scalajs/nodejs/fs/Fs.scala
similarity index 100%
rename from app/current/src/main/scala/io/scalajs/nodejs/fs/Fs.scala
rename to app/nodejs_v8/src/main/scala/io/scalajs/nodejs/fs/Fs.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/fs/package.scala b/app/nodejs_v8/src/main/scala/io/scalajs/nodejs/fs/package.scala
similarity index 100%
rename from app/current/src/main/scala/io/scalajs/nodejs/fs/package.scala
rename to app/nodejs_v8/src/main/scala/io/scalajs/nodejs/fs/package.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/url/URL.scala b/app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/URL.scala
similarity index 100%
rename from app/current/src/main/scala/io/scalajs/nodejs/url/URL.scala
rename to app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/URL.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/url/URLObject.scala b/app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/URLObject.scala
similarity index 100%
rename from app/current/src/main/scala/io/scalajs/nodejs/url/URLObject.scala
rename to app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/URLObject.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/url/URLSearchParams.scala b/app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/URLSearchParams.scala
similarity index 100%
rename from app/current/src/main/scala/io/scalajs/nodejs/url/URLSearchParams.scala
rename to app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/URLSearchParams.scala
diff --git a/app/current/src/main/scala/io/scalajs/nodejs/url/package.scala b/app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/package.scala
similarity index 100%
rename from app/current/src/main/scala/io/scalajs/nodejs/url/package.scala
rename to app/nodejs_v8/src/main/scala/io/scalajs/nodejs/url/package.scala
diff --git a/app/current/src/test/resources/1.txt b/app/nodejs_v8/src/test/resources/1.txt
similarity index 100%
rename from app/current/src/test/resources/1.txt
rename to app/nodejs_v8/src/test/resources/1.txt
diff --git a/app/current/src/test/resources/fileA1.txt b/app/nodejs_v8/src/test/resources/fileA1.txt
similarity index 100%
rename from app/current/src/test/resources/fileA1.txt
rename to app/nodejs_v8/src/test/resources/fileA1.txt
diff --git a/app/current/src/test/resources/fileA2.txt b/app/nodejs_v8/src/test/resources/fileA2.txt
similarity index 100%
rename from app/current/src/test/resources/fileA2.txt
rename to app/nodejs_v8/src/test/resources/fileA2.txt
diff --git a/app/current/src/test/resources/fileB1.txt b/app/nodejs_v8/src/test/resources/fileB1.txt
similarity index 100%
rename from app/current/src/test/resources/fileB1.txt
rename to app/nodejs_v8/src/test/resources/fileB1.txt
diff --git a/app/current/src/test/resources/fileB2.txt b/app/nodejs_v8/src/test/resources/fileB2.txt
similarity index 100%
rename from app/current/src/test/resources/fileB2.txt
rename to app/nodejs_v8/src/test/resources/fileB2.txt
diff --git a/app/current/src/test/resources/watchfile.json b/app/nodejs_v8/src/test/resources/watchfile.json
similarity index 100%
rename from app/current/src/test/resources/watchfile.json
rename to app/nodejs_v8/src/test/resources/watchfile.json
diff --git a/app/current/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala b/app/nodejs_v8/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala
similarity index 100%
rename from app/current/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala
rename to app/nodejs_v8/src/test/scala/io/scalajs/nodejs/fs/FsAsyncTest.scala
diff --git a/app/current/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala b/app/nodejs_v8/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala
similarity index 79%
rename from app/current/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala
rename to app/nodejs_v8/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala
index dbb688022..22d36710d 100644
--- a/app/current/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala
+++ b/app/nodejs_v8/src/test/scala/io/scalajs/nodejs/fs/FsTest.scala
@@ -8,21 +8,24 @@ import org.scalatest.FunSpec
 
 /**
   * File System (Fs) Tests
+  *
   * @author lawrence.daniels@gmail.com
   */
 class FsTest extends FunSpec {
 
+  val TEST_RESOURCES = "./app/nodejs_v8/src/test/resources/"
+
   describe("Fs") {
 
     it("supports watching files") {
-      val watcher = Fs.watch("./app/current/src/test/resources/", (eventType, file) => {
+      val watcher = Fs.watch(s"${TEST_RESOURCES}", (eventType, file) => {
         info(s"watcher: eventType = '$eventType' file = '$file'")
       })
       info(s"watcher: ${Util.inspect(watcher)}")
 
       setImmediate(
         () =>
-          Fs.writeFile("./app/current/src/test/resources/1.txt", "Hello", error => {
+          Fs.writeFile(s"${TEST_RESOURCES}1.txt", "Hello", error => {
             if (isDefined(error)) {
               alert(s"error: ${JSON.stringify(error)}")
             }
@@ -31,9 +34,9 @@ class FsTest extends FunSpec {
     }
 
     it("should stream data") {
-      val file1 = "./app/current/src/test/resources/fileA1.txt"
-      val file2 = "./app/current/src/test/resources/fileA2.txt"
-      val file3 = "./app/current/src/test/resources/fileC2.txt"
+      val file1 = s"${TEST_RESOURCES}fileA1.txt"
+      val file2 = s"${TEST_RESOURCES}fileA2.txt"
+      val file3 = s"${TEST_RESOURCES}fileC2.txt"
 
       val readable = Fs.createReadStream(file1)
       val writable = Fs.createWriteStream(file2)
@@ -58,8 +61,8 @@ class FsTest extends FunSpec {
     }
 
     it("should pipe data from a Readable to a Writable") {
-      val file1 = "./app/current/src/test/resources/fileB1.txt"
-      val file2 = "./app/current/src/test/resources/fileB2.txt"
+      val file1 = s"${TEST_RESOURCES}fileB1.txt"
+      val file2 = s"${TEST_RESOURCES}fileB2.txt"
 
       val readable = Fs.createReadStream(file1)
       val writable = Fs.createWriteStream(file2)
diff --git a/app/current/src/test/scala/io/scalajs/nodejs/readline/ReadlineTest.scala b/app/nodejs_v8/src/test/scala/io/scalajs/nodejs/readline/ReadlineTest.scala
similarity index 100%
rename from app/current/src/test/scala/io/scalajs/nodejs/readline/ReadlineTest.scala
rename to app/nodejs_v8/src/test/scala/io/scalajs/nodejs/readline/ReadlineTest.scala
diff --git a/app/current/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala b/app/nodejs_v8/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala
similarity index 100%
rename from app/current/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala
rename to app/nodejs_v8/src/test/scala/io/scalajs/nodejs/url/URLObjectTest.scala
diff --git a/app/current/src/test/scala/io/scalajs/nodejs/url/URLSearchParamsTest.scala b/app/nodejs_v8/src/test/scala/io/scalajs/nodejs/url/URLSearchParamsTest.scala
similarity index 100%
rename from app/current/src/test/scala/io/scalajs/nodejs/url/URLSearchParamsTest.scala
rename to app/nodejs_v8/src/test/scala/io/scalajs/nodejs/url/URLSearchParamsTest.scala
diff --git a/app/current/src/test/scala/io/scalajs/nodejs/url/URLTest.scala b/app/nodejs_v8/src/test/scala/io/scalajs/nodejs/url/URLTest.scala
similarity index 100%
rename from app/current/src/test/scala/io/scalajs/nodejs/url/URLTest.scala
rename to app/nodejs_v8/src/test/scala/io/scalajs/nodejs/url/URLTest.scala
diff --git a/build.sbt b/build.sbt
index 4843fdd47..4eef00dc7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -41,7 +41,7 @@ lazy val commonMacroParadiseSetting = Seq(
 )
 
 lazy val root = (project in file("."))
-  .aggregate(core, common, current)
+  .aggregate(core, common, nodejs_v8)
 
 lazy val core = (project in file("./core"))
   .enablePlugins(ScalaJSPlugin)
@@ -77,7 +77,7 @@ lazy val common = (project in file("./app/common"))
   .settings(commonMacroParadiseSetting)
   .dependsOn(core)
 
-lazy val current = (project in file("./app/current"))
+lazy val nodejs_v8 = (project in file("./app/nodejs_v8"))
   .dependsOn(common)
   .enablePlugins(ScalaJSPlugin)
   .settings(commonSettings)