Start refactoring for multiple deployments