[REFACT] DataDirWrapper moved to separate files