Files orderedby categories and better replacements for some parts