Restructured for environmets and berksfiles