Integrate the new singletons with the main class, route the relevant places to them.