Organized some stuff.