Updated dir structure