Remove decoding logic.
Rearrange classes.