Reorganize logging
Merge pull request #13 from rail/logging

Reorganize logging