re-internalizes some classes for now