Correcting for the new directory structure