Move dataflow to separate file for sharing
Simplifications
Generate masked instructions