Directories update (another part)

Now lets talk about breaking things. (@emanuele45 is too way ahead)