Complete server->column family refactor