Revert "Organise Settings.cs"

This reverts commit f26d5f309042047185adeb802802ff5c628e55cc.