Refactored User model to use MotionModel. Code reorg.