Marc: [module 1.0.x] simplify built.sbt and .scala