Organizing separate core and journal components.
Minor docstring fixes.