Moving scala files around for sbt project format