[UPDATE] moved directory mapping to util file.