better root folder handling
better root folder handling