Move hooks and helpers into env
Merge pull request #45 from mmun/env

Move hooks and helpers into env