Refactor Logging. Reorganized package layout.