Directories hierarchy fixed