restructuring for eclipse