Fix #14: SASL over non-SSL connection
WIP: Modularization