The fenders are the same piece (cj5) except the lower part by the door, the little bump out to match the rockers
The hood hinge locations are the same also.
The grill is the same piece except for the little wings holding the turn lights,
I have a buick v8 in mine and it's tight, and I would think a 4.0 straight 6 would be even longer, tougher to slip in it.
You might be able to use cj7 parts with the longer distance right behind the front wheels, then move the front axle forward. it has been done but that's a lot of work.
good luck