Remove empty fileTypes and put scopeName at top