improve directory naming and extract the names into constants.