Refactor the Singletons to manage themselves instead of having a single singleton managing them.