Revert "Switched away from a hierarchical taxonomy"

This reverts commit e894d16b75f2a0b8511fb7267705ae2f8f1f40f2.