adapt files for new folder structure