commenting
bugfix // file structure refactoring
tagging version 7.x-0.5
Merge branch 'release/7.x-0.5'