Clean up files: split flow.h