[expectations] First working implementation of clean structure
[expectations] Adapt expectations update to new structure