Switch re-arrange