Re-org to get ready for MTF parser.