Total remunge of all depts

For @bradleywright or @annashipman or @pauldowney to review