cleanup for new folder structure