Update asset structure to make it easier for adding to manifest