Separate out imports in first migration