Fixed import of new routes file
Reworked a lot of the flow for authentication