Add --org option to related commands
Refactor has_org with gen_table_fields method