Complete structure reorganization.