and remove extra folder