Restructure some stuff.