Add filtered pull, rich pull, subscribe, conflict resolution
Split client.rs into client/ directory module (v0.2.2)