Moved around the files after a mistake with eclipse.