Restructuring around new understanding of SKS client-server arch.