Shuffled files more
Merge branch 'master' into kingman