Corrected some asset hierachy issues