Refactor the package. And redirect after login.