Update restructure

@ivan114 @ytc903 @ryu1330  this is the restructured version