Rename CClientPirate to CPirate & somme updates to main