Dir restructured