moving files around to match sbt build conventions