Removed singleton manager and re-factored previous singleton classes
Cleaned up some code in SettingsManager