Tmp changes for router fixes.
Renamed directory back.