Internalized some classes and interfaces.