Moved more concepts to the right files.