Add intercepting sinks to the organization and folder modules (#2799)

Add intercepting sinks to the organization and folder modules (#2799) #8446