Again fix of folder names