Moving GenericManagement to module