Fixed extra folder removing