Flattened out directory structure a little to make layout simpler.