Additional structural changes, to make room for uploading
break synchronize.go into synchronize.go and api.go