eliminated extra directory layer