All main POI functionality completed.
Some folder rearrangement done under poi/