Refactoring fuel categories

- Addition of subcategories.
- Deletion of obsolete groups and individuals.