improved directory structure