Re-organized settings file