See:
Welcome to guzzle's In-tank Hutch Mod Web Page
After trying to find the individual components here I gave up and ordered the kit from Strictly Diesel. I'm freighting it over UPS ground to my US based freight consigner, then by Fed Ex from there to Oz.
The SD kit comes with the water seperater/filter - I'll add a pre-filter 'push' pump that I can source from here:
The Long Ranger Fuel Tanks - Product Features - TRANSFER PUMP