restructured modules