Addresses the comments in PR #2521 regarding code duplication in Main.hpp and flow_tag.hpp. This PR merges the code in flow_tag.hpp into Main.hpp such that flow_tag.hpp can be eliminated (will be done in the next PR).