Cleaned up cluster package layout

i think as your previous nice examples, we maybe use `if (!endpoint.live()) { return; }`