merging entities with tables, part 1
merging entities with tables part 2
refactoring of entities and tables part 3, final
added standard shop model