Reorganized for sbt

[none]