Reorder structures so that they can load

Previously a type was referenced before it existed.