Move built-in entities to proper package