Smarter directiry structure