resturcture

restructure