Of course you don't move the adp pages. And I realize that the interim fix is to leave/fix the package masters that are already there. I am not arguing about that.
I use many templates in big sites, and NONE of them are ones that come with OpenACS. Again, this means that I have a major amount of piss ass work when I upgrade a package. There is no need for package templates once the conversions are all done.
I know that I am not the only person who has run into this problem of changing every adp and template in a package because it makes (usually wrong) assumptions about what my client would like.
IRT, admin-masters, you can always have your admin template a cp of your master. Again, It sucks to have to change this and having another parameter for admin pages would solve the problem.
Again, this will mean less work for the majority of sites and if you want some customizations of your own, you can simply add them as templates of your own.