Fixed folder names and locations