Updated to work with the new directory structure