Better login form
Restructure files