Move remaining Java files to the Scala dir.
Finish converting to Scala.