Ministries of energy and infrastructure will be merged and also oversee national housing program, in series of moves aimed at creating more flexible and modern bureaucracy