Ready for login

Refactor files