reorg toward sensible sector handling