Re-organize guide pieces