Smarter directory structure