Moved environment classes to Environment namespace