Organize imports of java code to reduce Heap Space memory usage
Fixes #97