Massive folder restructuring
Merge remote-tracking branch 'origin/master'

Conflicts:
Merge remote-tracking branch 'origin/master'