Update to new folder structure