sensible names, better .gitignore structure, update utils