Adjusted dir struct