For new directory structure