Multi V + code reorganization