Refactoring, new choice between Server and Dev workstation