Categorize files better
Merge branch 'master' of https://github.com/mvysin/dotfiles