make logging a module; change affected files accordingly
Merge branch 'make-logging-a-module'