Edited after review-comments

-modefied Environment.hpp
-removed most of the forward declarations for class Environment
-removed some .tpp files