One other thought. I try to keep building blocks in purpose-designed Add-Ins or in a document template. That is, building blocks for a particular purpose are stored in a separate template. This makes it easier to organize them. Only if macros are going to be used with them do I store them in .dotm files, otherwise I store them in .dotx files.
Automated Boilerplate Using Microsoft Word