Core: Reorganizing data config folders