changed directory naming scheme