Move all package additions to prepare script