Reorganize directory structure
More refactor
rtree 0.8.0 was breaking GetFeatureInfo.