Breakout settings, re-arrange my config files, change indentation