Revised AHIS repo with different directory structure