eclipse cleanup, removing unnecessary natures, namging cleanup as well