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

...etter support Options
we need to test with Options too, right?