Standardize folder naming conventions