Update to use of Modules rather than configs