Rearranged modules so that the auth section is last.

This is based on a suggestion from Yuri.