fixed to use the new directory structure