Group the assets a bit better