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

...etter support Options
missing _root_.scala.Array on the end, and also _root_.java.lang.

The issue here is that, as you may know, if we don't do this the macro can fail based on the in-scope names at the time.