Stefanv importlib

Once you rebase on master,  I think that only the last commit should remain. That's what I'm proposing here.