login/signup restructure
Merge branch 'login'