Refactor and integer new sbt plugins