Refactor of controller packages
Model Updated:
Now allows Products and Services, and a favourites criteria list was
added to the user
Model Updated: Phone added to the User and Commerce