module: Made socket factory easily accessible.
Merge branch 'better_modularization'