Merged some portlogger and module refactoring changes.