Added host binding to server
Refactored old/new environment renaming