restructure, clean up and try to do a better job tracking down locations