clarify splitting/duplicate logic when organizi...
Made organize imports compatible with OpenStack...
Split imports in AddingVisitor