Reorganization/renaming files.
Merge remote-tracking branch 'Github/master'