Tidying up assets structure