Move directory data into router, update usercard in directory