Change directory structure, update sbt build config