Water Resources, Cyber and National Digital Matters, Higher Education, Strategic Affairs, Community Empowerment and Advancement all to be absorbed into other offices