initial restructure push