Reset folder name and fixed bugs