Add "classes/", remove unused folder
Explicitly sort bad option names before error