Reorganized assets hierarchy