move ext.pupa into the top level

ugh, so much broken here but consolidation will make the eventual merger a bit easier

PEP 20 qotd: flat is better than nested