Split package spec and body, with "Prompt For Reload..." bug

I can reproduce this in 16.1, but not beta.

We made this change recently in beta, that seems to have fixed it.

-John