[ci skip] Move Environment ext to main file and update comments