Use stream instead of loop
Move log-connectors into main package
Fix bug in unit test