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

...etter support Options
don't we need `_root_.cascading` and `_root_.scala` to be safe?