Environment refactoring
Possible fix for post pdal install
Merge with most recent changes