Move users and sessions out of api namespace