Moving treeify, adding geoip