Solution nanostructure induced by amphiphile self-association plays an important role in various chemical and physical processes, including liquid-liquid extraction (LLE). Small angle scattering techniques are an essential means of probing this structure, but, due to non-uniqueness of scattering patterns, their interpretation is not trivial. Here, we decompose small angle x-ray scattering (SAXS) patterns for a range of binary LLE organic phases into two components: Ornstein-Zernike and pre-peak contributions resulting from, respectively, critical concentration fluctuations and packing of the amphiphilic extractant molecules in the nonpolar aliphatic diluent. While we previously applied Ornstein-Zernike scattering models to similar organic phases, including the pre-peak explicitly in the fit allows us to measure weak fluctuations at high extractant concentration and simultaneously obtain information on the position and intensity of the correlation peak related to amphiphile packing. Scattering patterns and partial structure factors calculated from molecular dynamics simulations support this interpretation. We demonstrate how this minimal scattering model describes nanostructuring for a large number of extractant types over their entire extractant/diluent composition ranges, suggesting simple and universal behavior. The straightforward assignment of these structural contributions facilitates the comparison of these features between different classes of extractant molecules and will enable further studies of organic phase aggregation. Applicability to more complex, process-relevant organic phases is illustrated with post-contact organic phases containing significant quantities of extracted lanthanide nitrate salt, which we find are readily described by this model.