Partially complete separation

Some functionality has been broken, but at the very
least Convert to Energy still works

Refs #9968