Change directory structure to be more idiomatic.

r? @SimonSapin