redesign the directory structure