Gave up on directory structure. It's flatter now.