Update the directory structure to better visualize how to reorganize