Extraction and re-org.