Made the majority of classes internal.
Fixed logging contexts to follow the actual class.