reorganize to keep track of what we are modifying and what needs to be up to date
get the right checkouts and sources to make things work with the latest
rework checkouts, add reference to new package