[#70561992] Code review and moved organization objects