Cleanup, moved things, fixed geocode building hopefully