Rework MP model build

Add MP model builder. Fix MPS encoder/decoder collisions.