reg-step-1 + js restructure