Reorganized to folders by class