bug fix
bug fix
Organize as sbt project