Changes to assets structure