I feel the same way about AJ moving too, let him be the face of SmackDown like Batista, Taker & Edge were in years gone by. Rollins switching with him would be a natural swap though.
Tag division definitely needs a shakeup. I said that New Day and Enzo & Cass needed to be on seperate rosters...