added dirs tree and some more changes