Let's update master to modularized Prime

This is mostly to show newcomers that we're still working on Prime. Also fixes compile errors with 2.10 compared to master.