Authentication cleanup
Reorg