Refactored out const fields

In preparation for the serialization step.

And I'm pretty sure someone will ask, so:
Interface fields have implicit public static final modifiers and this is a common pattern for declaring constants.