Move key outside of point... This will break stuff

Readis structure should probably be re-thought a little. Seems like
we're spending an awful lot of energy dissasembling and assembling keys.