diff --git a/build.sbt b/build.sbt
index 6fc41990..d3efe1df 100644
--- a/build.sbt
+++ b/build.sbt
@@ -95,7 +95,7 @@ lazy val effects = (crossProject in file("freestyle-effects"))
 lazy val effectsJVM = effects.jvm
 lazy val effectsJS  = effects.js
 
-lazy val async = (crossProject in file("async/async"))
+lazy val async = (crossProject in file("freestyle-async/async"))
   .dependsOn(freestyle)
   .settings(name := "freestyle-async")
   .jsSettings(sharedJsSettings: _*)
@@ -104,7 +104,7 @@ lazy val async = (crossProject in file("async/async"))
 lazy val asyncJVM = async.jvm
 lazy val asyncJS  = async.js
 
-lazy val asyncMonix = (crossProject in file("async/monix"))
+lazy val asyncMonix = (crossProject in file("freestyle-async/monix"))
   .dependsOn(freestyle, async)
   .settings(name := "freestyle-async-monix")
   .crossDepSettings(
@@ -117,7 +117,7 @@ lazy val asyncMonix = (crossProject in file("async/monix"))
 lazy val asyncMonixJVM = asyncMonix.jvm
 lazy val asyncMonixJS  = asyncMonix.js
 
-lazy val asyncFs = (crossProject in file("async/fs2"))
+lazy val asyncFs = (crossProject in file("freestyle-async/fs2"))
   .dependsOn(freestyle, async)
   .settings(name := "freestyle-async-fs2")
   .jsSettings(sharedJsSettings: _*)
diff --git a/async/async/shared/src/main/scala/async.scala b/freestyle-async/async/shared/src/main/scala/async.scala
similarity index 100%
rename from async/async/shared/src/main/scala/async.scala
rename to freestyle-async/async/shared/src/main/scala/async.scala
diff --git a/async/async/shared/src/test/scala/AsyncTests.scala b/freestyle-async/async/shared/src/test/scala/AsyncTests.scala
similarity index 99%
rename from async/async/shared/src/test/scala/AsyncTests.scala
rename to freestyle-async/async/shared/src/test/scala/AsyncTests.scala
index d4de0994..469754db 100644
--- a/async/async/shared/src/test/scala/AsyncTests.scala
+++ b/freestyle-async/async/shared/src/test/scala/AsyncTests.scala
@@ -66,5 +66,6 @@ class AsyncTests extends AsyncWordSpec with Matchers {
 
       program[AsyncM.Op].interpret[Future] recover { case OhNoException() => 42 } map { _ shouldBe 42 }
     }
+
   }
 }
diff --git a/async/fs2/shared/src/main/scala/asyncFs2/async.scala b/freestyle-async/fs2/shared/src/main/scala/asyncFs2/async.scala
similarity index 100%
rename from async/fs2/shared/src/main/scala/asyncFs2/async.scala
rename to freestyle-async/fs2/shared/src/main/scala/asyncFs2/async.scala
diff --git a/async/fs2/shared/src/test/scala/asyncFs2/AsyncFsTests.scala b/freestyle-async/fs2/shared/src/test/scala/asyncFs2/AsyncFsTests.scala
similarity index 100%
rename from async/fs2/shared/src/test/scala/asyncFs2/AsyncFsTests.scala
rename to freestyle-async/fs2/shared/src/test/scala/asyncFs2/AsyncFsTests.scala
diff --git a/async/monix/shared/src/main/scala/asyncMonix/async.scala b/freestyle-async/monix/shared/src/main/scala/asyncMonix/async.scala
similarity index 100%
rename from async/monix/shared/src/main/scala/asyncMonix/async.scala
rename to freestyle-async/monix/shared/src/main/scala/asyncMonix/async.scala
diff --git a/async/monix/shared/src/test/scala/asyncMonix/AsyncMonixTests.scala b/freestyle-async/monix/shared/src/test/scala/asyncMonix/AsyncMonixTests.scala
similarity index 100%
rename from async/monix/shared/src/test/scala/asyncMonix/AsyncMonixTests.scala
rename to freestyle-async/monix/shared/src/test/scala/asyncMonix/AsyncMonixTests.scala