Merged directories 'asp_encodings' and 'tools'