Restructure folder aids
Merge branch 'master' of https://github.com/ueg1990/ads