Organize TCP admin code better

Assigned To: