Flatten the user entity. Fix Create/Modify user methods.

Nested structure in the user's entity is problematic at updates. Flattening the structure was the easiest way to ensure atomic operations with mongo.