Some more re-org of passcode functionality