Improved directory structure.