[MERGE] data file loading refactoring, ready for code autoreload