Updated to reflect change in directory structure