WIP: assets restructuration