Reorganizing
Merge branch 'master' of https://github.com/scangeo/xor-files