added sbt build
tree refactoring to match sbt tree structure
minor changes