Improve watcher tracing. Improve object naming. Split core to core and core-extension-point