Moving a few classes into the public API