finish refactoring import stage to use adapters