DIR reoganized