Added a Settings page
Relocated files and folders
Updated links
Merge remote-tracking branch 'GitHub/master'