Finished moving blocks to Scala
Removed unnecessary single java block classes
Organized some imports