[FOLD] Refactor Peers