Updates to Modules and structure