Move User To another models
Revert "Move User To another models"

This reverts commit 5983e0e2cd13e3b240875240d3fb8b792adb3284.