Updated with '/dir' abstract structure