Refactor output adapter

This is a bit of a wrong name, but naming is hard… It fixes some "issues" from the last refactoring, namely that I forgot to move some parts to the right places. It also removes an unused variable when mapping from database entities to domain entities.