dir hierarchy restructured
Merge branch 'master' into pull_list
Updated git ignore