[Organization] Refactor