Better dir structure.