Moving auth parts where they belong