Updated dir-structure