Focused project on TSOCategorizer

Making an independent project of a branch is not the right approach.