Initial implementation of redesigned asset structure