More sbt refactoring