Merge the "V3" message classes into the normal ones

We have no need for this abstraction so let's keep things simple.
20 files changed