Build.scala refactored