properly removing files that were moved into new folder structure