move journal stuff to own module