finished reorg of cognito sections