Reworked sbt build