New directory structure approach.