Refactor directory structure to sbt-style
Removes duplication
Clean up