Reorganize Interface imports