Changed directory names for standardization