- Renaming of files to make them less confusing
Merge remote-tracking branch 'origin/master'