Renaming some category related files to make more sense