Reorganize imports (some old not valid imports)