refactor modules to accommodate next expansion