maven module restructuring
restructured modules