New structure for assets

@JenPeleva, please review.