Making mediators and adapters private, take 2

I left out some and they were not priv