Is this import reorganization working AGAINST eclipse (as it looks like) or WITH it? We try to keep eclipse happy to avoid flip-flopping.