Using a more industry-standard directory naming scheme