Initial check-in for Re-structuring flow code.