Added remaining dirs