Fuel tank options for 5.9 fi swap?

I've looked at 96 Jeep Cherokee fuel tank just briefly and suspected it would go under the A-body, straps and all but only if the trunk floor/spare tire well was totally redone to flat like the back of the Jeep is. The floor may need to be raised a few inches also.
I hoped to try this someday. The spare doesn't fit in the well anyway.