Update for the change of directory structure