Updates to reflect changed directory structure.