new structure for eclipse.derp