A lot of changes with entities, big update of ShopService class and
interface. Also quite a few minor tweaks.