Fix organization a bit, oops.