A bit of refactoring; set the version of sbt;