add proper link and folder deletions