Split DeploymentScenario into Environment & DeploymentScenario classes