Move utils to src dir
Merge branch 'master' of github.com:eanger/eggs