Committed!
Merge remote-tracking branch 'origin/master'
Relocated some misplaced files.