Reorganizing.

Don't know what snippet vs. language-test difference are, though.