Reorganization for sbt  build