Public body categories - restructuring

First steps in restructuring the public body categories
(to be updated)