Shifted (point|(co)?id)[PK] to main package object

[none]