Added basic helpers
Cleaner structure
Merge branch 'master' of github.com:korczis/the-scratch