Renamed environment class to reflect its real purpose
Refactored the rest clients using a generic base class