Major reorganization, nearly complete