restructured modules and exports