Bunch of eclipse file changes, don't remember why.