diff --git a/build.sbt b/build.sbt
index 36fac206..3acd2e40 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,3 @@
-import com.github.sbtliquibase.SbtLiquibase
-
 val commonSettings = Seq(
   organization := "com.github.karasiq",
   version := "1.0.0-SNAPSHOT",
@@ -296,9 +294,9 @@ lazy val `meta-tests` = (project in file("target") / "meta-tests")
   .settings(commonSettings, name := "shadowcloud-meta-tests")
   .aggregate(coreAssembly, `server-api-routes`, autowireApiJVM)
 
-lazy val shell = (project in file("."))
-  .settings(commonSettings)
+lazy val shell = project
   .settings(
+    commonSettings,
     name := "shadowcloud-shell",
     mainClass in Compile := Some("com.karasiq.shadowcloud.test.Benchmark"),
     libraryDependencies ++= Seq(
@@ -307,8 +305,15 @@ lazy val shell = (project in file("."))
     initialCommands in console :=
       """import com.karasiq.shadowcloud.shell.Shell._
         |init()
-        |test()
-        |""".stripMargin,
+        |//test()
+        |""".stripMargin
+  )
+  .dependsOn(coreAssembly, javafx)
+
+lazy val shadowcloud = (project in file("."))
+  .settings(
+    commonSettings,
+    name := "shadowcloud-root",
     liquibaseUsername := "sa",
     liquibasePassword := s"${sys.props("shadowcloud.persistence.h2.password").ensuring(_.ne(null), "No password").replace(' ', '_')} sa",
     liquibaseDriver := "org.h2.Driver",
@@ -318,7 +323,7 @@ lazy val shell = (project in file("."))
       val compress = sys.props.getOrElse("shadowcloud.persistence.h2.compress", true)
       s"jdbc:h2:file:$path;CIPHER=$cipher;COMPRESS=$compress"
     },
-    liquibaseChangelog := file("src/main/migrations/changelog.sql")
+    liquibaseChangelog := sourceDirectory.value / "migrations" / "changelog.sql"
   )
-  .dependsOn(coreAssembly, javafx)
-  .enablePlugins(SbtLiquibase)
\ No newline at end of file
+  .enablePlugins(com.github.sbtliquibase.SbtLiquibase)
+  .aggregate(coreAssembly, server, javafx)
\ No newline at end of file
diff --git a/project/ProjectDeps.scala b/project/ProjectDeps.scala
index a88cdb6e..3ff1fd7b 100644
--- a/project/ProjectDeps.scala
+++ b/project/ProjectDeps.scala
@@ -140,7 +140,7 @@ object ProjectDeps {
   )
 
   def webzinc: Deps = {
-    val version = "1.0.6"
+    val version = "1.0.7"
     Seq(
       "com.github.karasiq" %% "webzinc" % version,
       "com.github.karasiq" %% "webzinc-htmlunit" % version
diff --git a/src/main/resources/application.conf b/shell/src/main/resources/application.conf
similarity index 100%
rename from src/main/resources/application.conf
rename to shell/src/main/resources/application.conf
diff --git a/src/main/scala/com/karasiq/shadowcloud/metadata/MetadataParserApp.scala b/shell/src/main/scala/com/karasiq/shadowcloud/metadata/MetadataParserApp.scala
similarity index 100%
rename from src/main/scala/com/karasiq/shadowcloud/metadata/MetadataParserApp.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/metadata/MetadataParserApp.scala
diff --git a/src/main/scala/com/karasiq/shadowcloud/shell/ImplicitConversions.scala b/shell/src/main/scala/com/karasiq/shadowcloud/shell/ImplicitConversions.scala
similarity index 81%
rename from src/main/scala/com/karasiq/shadowcloud/shell/ImplicitConversions.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/shell/ImplicitConversions.scala
index f09f41e9..a2d77f39 100644
--- a/src/main/scala/com/karasiq/shadowcloud/shell/ImplicitConversions.scala
+++ b/shell/src/main/scala/com/karasiq/shadowcloud/shell/ImplicitConversions.scala
@@ -1,6 +1,6 @@
 package com.karasiq.shadowcloud.shell
 
-import java.nio.file.{Paths, Path => FSPath}
+import java.nio.file.{Paths, Path ⇒ FSPath}
 
 import scala.language.{implicitConversions, postfixOps}
 
diff --git a/src/main/scala/com/karasiq/shadowcloud/shell/RegionContext.scala b/shell/src/main/scala/com/karasiq/shadowcloud/shell/RegionContext.scala
similarity index 100%
rename from src/main/scala/com/karasiq/shadowcloud/shell/RegionContext.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/shell/RegionContext.scala
diff --git a/src/main/scala/com/karasiq/shadowcloud/shell/Shell.scala b/shell/src/main/scala/com/karasiq/shadowcloud/shell/Shell.scala
similarity index 100%
rename from src/main/scala/com/karasiq/shadowcloud/shell/Shell.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/shell/Shell.scala
diff --git a/src/main/scala/com/karasiq/shadowcloud/shell/ShellContext.scala b/shell/src/main/scala/com/karasiq/shadowcloud/shell/ShellContext.scala
similarity index 100%
rename from src/main/scala/com/karasiq/shadowcloud/shell/ShellContext.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/shell/ShellContext.scala
diff --git a/src/main/scala/com/karasiq/shadowcloud/shell/ShellUtils.scala b/shell/src/main/scala/com/karasiq/shadowcloud/shell/ShellUtils.scala
similarity index 100%
rename from src/main/scala/com/karasiq/shadowcloud/shell/ShellUtils.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/shell/ShellUtils.scala
diff --git a/src/main/scala/com/karasiq/shadowcloud/shell/StorageContext.scala b/shell/src/main/scala/com/karasiq/shadowcloud/shell/StorageContext.scala
similarity index 100%
rename from src/main/scala/com/karasiq/shadowcloud/shell/StorageContext.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/shell/StorageContext.scala
diff --git a/src/main/scala/com/karasiq/shadowcloud/test/Benchmark.scala b/shell/src/main/scala/com/karasiq/shadowcloud/test/Benchmark.scala
similarity index 100%
rename from src/main/scala/com/karasiq/shadowcloud/test/Benchmark.scala
rename to shell/src/main/scala/com/karasiq/shadowcloud/test/Benchmark.scala
diff --git a/src/main/migrations/changelog.sql b/src/migrations/changelog.sql
similarity index 100%
rename from src/main/migrations/changelog.sql
rename to src/migrations/changelog.sql