[sd] organized code into capture/watch namespaces