X plat dev

merge the code reconstructure