Fix categories to have proper path, and remove nested categories