Move as much as possible to before starter-kit package since that fails at the moment.
A bunch of accumulated changes.