making directory naming more reasonable...