Moved User.* into Model dir