moved stuff to make eclipse work..