Reorganisation of the CategoryProcessor.