major refactoring: assets, groups