Moved more things over to a singleton setup and cleaned up namespace.