set up folder structure according to IA and moved files around
Merge remote-tracking branch 'origin/master'