Moved files around so it is easier for people to copy the files
Merge remote-tracking branch 'origin/master'