Change password request functionality; Some package renaming and code reshuffling