Update imports to scala 2.10+ locations