Complete refactor, moving toward rex-* ecosystem standards