Minor log output update. Module structure minor refactoring.