user organization refactory first step