Move imports to their proper place