Change directory structure to be more idiomatic.