Massive rafactoring to make use of a centralized service manager and remove a lot of custom code.