Authentication & Iden. refactoring complete