Rearrange POI classes a bit
Some steps in native POI reading