move some props to non common tree
to avoid newline problem

Signed-off-by: Willi Ye <williye97@gmail.com>