Move all to /usr
http://fedoraproject.org/wiki/Features/UsrMove
Says it all really. I think it's a "Good Idea"(TM). Yes, it's a change and some people won't like it - but times they are a changin'.
I would even vote against providing symlinks in / to the relevant new locations, but I'm perhaps being a bit strict about that.