Renamed root folder and fixed bugs
fixed bug