Major refactoring after import in Eclipse.