Minor modifications of dirs and filenames
Merge branch 'master' of https://github.com/pakozm/april-ann