Improved overall directory structure