fixed Dir organization