Statistical-Thermodynamic Theory of Surfactant Organization in Micelles and Bilayers