added: Types and Characteristics
fixed: some directory names