Refactoring to get rid of DBManager, and new modules.