adjust the final and remove folder