Fixed password reset functions and routed actions to main (outside package) controllers