Move settings around
Merge pull request #776 from Geczy/settings-file-organization

Move setting files around