Reorganization in order to resolve conflicts with multiple declarations of interfaces