Merge "Move the Flag helper files to separate folders." into main