Split import code into separate parts