Some more restructure of imports