reorganize and start of new onboarding