Reorganized module data structure