add flora-2 code
reorg WM hierarchy