refactoring names
file test proto
pht
pht2
pht
fix mrg
cmp fix
adv mod adding