clean up the input directories a little bit

can have more stuff in private/ now
more private/ fixes
make geocodertest pass