Merges amm::desktop_file_categories into amm::desktop

This class could be confused with amm::subcategory and it didn't have
many responsibilities.