restructure auth section