updated directory naming convention