Fix broken directory structure