Finish our Modules Refactor

Complete and Continue