Change the directory structure to be more descriptive