Refactor organization menu

Refactor process