Breakout code into settings and util modules
Finish initial separation of code into util and settings. All tests passed