Reorganized structure to match typical modules (cont)