Move package stuff into single code block.
Merge conflicts...