Reorganize basic integration and outline.