[WIP] Moved entitites from VespolinaCore