In a reorganization, the beauty giant leans into higher-end beauty brands and mass-market fragrances.