Minor fixes
Refactoring wave 1. Turned user.profile.* to user.*