Moved singletons to own classes.