Initial check-in Part-II for Re-structuring flow code