Project re-organization and updated sbt build file