Organization in ThisBuild + Scala/sbt upgrades