Refactor organization definition.