Added some dirs
Some changes