Pypi support

Can you move pypi before fallback?