Refactor options to hang off modules
Start sub options refactor
Refactor out module options
Refactored sub options