Tiny restructure
Added AuthenticationService