Renaming settings files to less ambiguous names
Merge remote-tracking branch 'origin/settings' into settings