More Scalafication

Some core classes, and required modifications.