Crates continued to grow in number, but most are still quite small and feature specific. This refactor consolidates them.
