Fix the forward propagation with the new directory structure.