Move Assets to objects classes