Added data folder renaming to XPS loading