More login stuff
Finished with login
Restructure