Slight reorganize. Cleaner now
Removed rex as a dependency (still use some if it's generated code)