Resize state updates

Split resize and mounts into new units and a little cleanup