Moving files to a more logical place
Update docs
Merge remote-tracking branch 'github/master'