Baby steps, moved couple defstructs into runsmod.