Encapsulate data reorg.
Work on mixed action pion.  Current state is incorrect.