Clean up the directory structure in preparation for submission