Directories tree changed
Small fixes