[Kerry] update folder structure