Move things around to find a better structure for the concepts.

Following suggestion in #2813