c code fixes
Put csasl bundle in its own directory, then clean it up