changed to eclipse structure