adapt to mdv repo reorganization