Merged Environment classes into one. Removed unused classes.