Add verification on entry & remove added folder