refactor as organization site