restructure

On the up