Modified main models and user models to new format to allow more changes from the user.
New format!

Signed-off-by: Claudio Rodriguez <claudio.rdgz@gmail.com>