Refactor where extensions live in the code base