Refactor imports.
Continue to refactor the import for "dataset"
Make "persistence" a module.
Final part of refactor.
Begin moving things into the objects.
Refactor more stuff up to an object.