Reorganize functionality that's common for servers and query servers.
Remove unused library: snitch.
Merge branch 'also-refactor-vtocc'