Cleaned up and separated SWIG-build macros into separate files
cmake: Java cleanup