More stuff moved into c2s

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Very temporary privacy lists persistent storage

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>