move User model to user package
rename some activities