More adjustment of directories to align with morph