Reorder the folders

Reorder the folders by composition