sbt project added, packages refactoring