Refactor organization menu

Refactor process

Remove unused methods
Fix conflict