move things around to fix package tangles