Move subtypes into their own module.

This unlinks the subtypes from the format_token module, where it doesn't
really belong.
9 files changed