Reorganized structure to match typical modules