Additional packages in build.sbt do not follow project convention

[muya]

The additional packages defined in build.sbt are not following the project naming convention -- they say:

// Adds additional packages into Twirl
//TwirlKeys.templateImports += "$organization$.controllers._"

// Adds additional packages into conf/routes
// play.sbt.routes.RoutesKeys.routesImport += "$organization$.binders._"

We expect

// Adds additional packages into Twirl
//TwirlKeys.templateImports += "$organization$.$name$.controllers._"

// Adds additional packages into conf/routes
// play.sbt.routes.RoutesKeys.routesImport += "$organization$.$name$.binders._"