Reorganized the build.sbt a bit