Restructured modules files to be prefixed with 'module_'