Refactor around the macro definitions into 3 files. Both converter and s...

...etter support Options
he who re-maps java in import scope... but might aswell make it as robust as possible