Try to fix compiler issues
Slight tool restructure

- attempt to fix compiler issues again
Fix Scala compile issue by using a scala <-> java proxy class