- Renamed category files to avoid naming clashes