Install refactoring

Right. I will work on this branch after we finish Boto provider pull.