Unify asset folders