City of Madison combines departments