upgrade to new folder structure