the rest of the /usr/bin move
ignoring some doubly-broken things