Changed assets structure, fixes