big move and edits for the package experiment
fixup
fixup
fixup
fixup
fixup
fixup
fixup
fixup
fixup