refactor packages. remove aggregations. improve vmr alignment