Added: Model restructuration, GiftListService Unit testing