Completed reorg of sections for install per OS