rename cluster related files
Refactor tcp clusters
Add some comments
Merge remote-tracking branch 'origin/es-commentary' into nvw-misc