restructure

or something