@wip New structure with geometry and entity classes implemented