Tidy

Making classes internal that are not part of the public API