Finish re-routing after moving TH components to front