Modified some imports in eclipse. Bad namely