Reorganized sbt files