Add an abstract level with extractors
Add Categories extraction
Fix some PHPDoc