Updated the directory structure