reflecting new khandroid dir structure