Organise Settings.cs