Code review changes

* Namespaced everything under :environment:servers
and :environment:local