Reworked auth redirect and created base & mapper classes