Big refactor in order to correctly represent a DeploymentSpace