Inclusion of the energy thread in the introductory physics curriculum: An example of long-term conceptual and thematic coherence