refactored sbt build