Make OperationHandler and WatchHandler properly encapsulate their
concerns and make them not depend on the global path