Change/higher kinded

This is the new higher-kinded scheme. 
Would be good to do this yes. We have a to-do list item to rehaul the whole name mangling scheme.