split cat-consumer into cat-consumer and cat-consumer-advanced
more cleanup
replace analyzer factory with analyzer manager
more package alignment