Reorganized built-in-classes