Merge "Reorder multiplexer class hierarchy"