- Reorganized the features to use full namespace
- Simplified category.xml to remove unnecessary versions