Re-organize intro