Rearrange SHDP. Update SHLDA with train/test