Adjust directories, add .gitignores
Merge remote-tracking branch 'origin/master'