Updated dir struct