Eclipse source refactor, clean-up, organize imports