fixing up asset structure