Split import feature into two files