Better organised folder structure
Merge remote-tracking branch 'Github/master'