RFC: Better Environment management

Apply some conventions and move things around with the goal of being more consistent and easier to maintain.