Started refactoring of data subpackage.