Reorganization of file loading - preparation for DatasetManger singleton removal.