improved folder structure
Merge branch 'master' of https://github.com/psyflo/tagem