Revert "Issue #1588422 by andypost, disasm, sun, dawehner, vasi1186, alexpott, tim.plunkett, larowlan, Gábor Hojtsy: Convert contact categories to configuration system."
This reverts commit 5cb63c4d13c58e74db10eefcd9b855228aabd258.
Oops. That was a little more patch than we bargained for. :P
Issue #1760530 by jenlampton, Albert Volkman, crazyrohila, Risse, justafish, Fabianx: Move all template files provided by core modules and themes into a 'templates' directory inside that module directory.