Converted all primary source code to Scala - only remaining Java is from ANTLR