renamed root folder and fixed bugs