diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index 7acc8c4839e..ad93085ceb2 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -19,7 +19,6 @@ import 'package:analysis_server/src/operation/operation_queue.dart';
 import 'package:analysis_server/src/package_map_provider.dart';
 import 'package:analysis_server/src/package_uri_resolver.dart';
 import 'package:analysis_server/src/protocol.dart';
-import 'package:analyzer/index/index.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
@@ -28,6 +27,7 @@ import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/java_engine.dart';
+import 'package:analysis_services/index/index.dart';
 
 
 /**
diff --git a/pkg/analysis_server/lib/src/operation/operation_analysis.dart b/pkg/analysis_server/lib/src/operation/operation_analysis.dart
index 16b316ccbb0..96eb77afe28 100644
--- a/pkg/analysis_server/lib/src/operation/operation_analysis.dart
+++ b/pkg/analysis_server/lib/src/operation/operation_analysis.dart
@@ -13,7 +13,7 @@ import 'package:analysis_server/src/computer/computer_overrides.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/operation/operation.dart';
 import 'package:analysis_server/src/protocol.dart';
-import 'package:analyzer/index/index.dart';
+import 'package:analysis_services/index/index.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
diff --git a/pkg/analysis_server/lib/src/socket_server.dart b/pkg/analysis_server/lib/src/socket_server.dart
index 8b4a59ca29e..fca31622810 100644
--- a/pkg/analysis_server/lib/src/socket_server.dart
+++ b/pkg/analysis_server/lib/src/socket_server.dart
@@ -16,9 +16,9 @@ import 'package:analysis_server/src/domain_server.dart';
 import 'package:analysis_server/src/package_map_provider.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
-import 'package:analyzer/index/index.dart';
-import 'package:analyzer/src/index/local_index.dart';
 import 'package:path/path.dart' as pathos;
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/index/local_file_index.dart';
 
 
 /**
@@ -34,7 +34,7 @@ Index _createIndex() {
   if (!indexDirectory.existsSync()) {
     indexDirectory.createSync();
   }
-  Index index = createLocalFileSplitIndex(indexDirectory);
+  Index index = createLocalFileIndex(indexDirectory);
   index.run();
   return index;
 }
diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml
index dbcb0637a59..997aeb06306 100644
--- a/pkg/analysis_server/pubspec.yaml
+++ b/pkg/analysis_server/pubspec.yaml
@@ -6,13 +6,14 @@ homepage: http://www.dartlang.org
 environment:
   sdk: '>=1.0.0 <2.0.0'
 dependencies:
-  analyzer: '>=0.19.0 <0.20.0'
+  analysis_services: '>=0.1.0 <1.0.0'
+  analyzer: '>=0.21.0 <1.0.0'
   args: any
   logging: any
   path: any
   watcher: any
 dev_dependencies:
-  analysis_testing: '>=0.1.0 <0.2.0'
+  analysis_testing: '>=0.1.0'
   mock: '>=0.10.0 <0.11.0'
-  typed_mock: '>=0.0.4 <0.1.0'
+  typed_mock: '>=0.0.4 <1.0.0'
   unittest: '>=0.10.0 <0.12.0'
diff --git a/pkg/analysis_server/test/analysis_abstract.dart b/pkg/analysis_server/test/analysis_abstract.dart
index 1c3f072d54a..32f8e1e954f 100644
--- a/pkg/analysis_server/test/analysis_abstract.dart
+++ b/pkg/analysis_server/test/analysis_abstract.dart
@@ -10,10 +10,10 @@ import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analysis_server/src/protocol.dart';
+import 'package:analysis_services/index/index.dart';
 import 'package:analysis_testing/mock_sdk.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
-import 'package:analyzer/index/index.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
 
diff --git a/pkg/analysis_server/test/domain_search_test.dart b/pkg/analysis_server/test/domain_search_test.dart
index 1f7fcf525cd..234d0da526c 100644
--- a/pkg/analysis_server/test/domain_search_test.dart
+++ b/pkg/analysis_server/test/domain_search_test.dart
@@ -10,11 +10,11 @@ import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/domain_search.dart';
 import 'package:analysis_server/src/protocol.dart';
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/index/local_memory_index.dart';
 import 'package:analysis_testing/mock_sdk.dart';
 import 'package:analysis_testing/reflective_tests.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
-import 'package:analyzer/index/index.dart';
-import 'package:analyzer/src/index/local_index.dart';
 import 'package:unittest/unittest.dart';
 
 import 'analysis_abstract.dart';
@@ -78,11 +78,11 @@ main() {
 
 @ReflectiveTestCase()
 class SearchDomainTest extends AbstractAnalysisTest {
-  LocalIndex index;
+  Index index;
 
   @override
   Index createIndex() {
-    return createLocalMemorySplitIndex();
+    return createLocalMemoryIndex();
   }
 
   @override
diff --git a/pkg/analysis_server/test/mocks.dart b/pkg/analysis_server/test/mocks.dart
index 5f381f71286..a27a3e2a4c1 100644
--- a/pkg/analysis_server/test/mocks.dart
+++ b/pkg/analysis_server/test/mocks.dart
@@ -10,6 +10,7 @@ import 'dart:io';
 @MirrorsUsed(targets: 'mocks', override: '*')
 import 'dart:mirrors';
 
+import 'package:analysis_services/index/index.dart';
 import 'package:analyzer/file_system/file_system.dart' as resource;
 import 'package:analyzer/file_system/memory_file_system.dart' as resource;
 import 'package:analysis_server/src/analysis_server.dart';
@@ -19,12 +20,10 @@ import 'package:analysis_server/src/operation/operation.dart';
 import 'package:analysis_server/src/package_map_provider.dart';
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:matcher/matcher.dart';
 import 'package:mock/mock.dart';
 import 'package:unittest/unittest.dart';
-import 'package:analyzer/index/index.dart';
 
 /**
  * Answer the absolute path the the SDK relative to the currently running
diff --git a/pkg/analyzer/lib/index/index.dart b/pkg/analysis_services/lib/index/index.dart
similarity index 100%
rename from pkg/analyzer/lib/index/index.dart
rename to pkg/analysis_services/lib/index/index.dart
diff --git a/pkg/analyzer/lib/index/index_store.dart b/pkg/analysis_services/lib/index/index_store.dart
similarity index 99%
rename from pkg/analyzer/lib/index/index_store.dart
rename to pkg/analysis_services/lib/index/index_store.dart
index a5b07638d54..cb678ac85c1 100644
--- a/pkg/analyzer/lib/index/index_store.dart
+++ b/pkg/analysis_services/lib/index/index_store.dart
@@ -6,7 +6,7 @@ library engine.index_store;
 
 import 'dart:async';
 
-import 'package:analyzer/index/index.dart';
+import 'package:analysis_services/index/index.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
diff --git a/pkg/analysis_services/lib/index/local_file_index.dart b/pkg/analysis_services/lib/index/local_file_index.dart
new file mode 100644
index 00000000000..3e202d9f84a
--- /dev/null
+++ b/pkg/analysis_services/lib/index/local_file_index.dart
@@ -0,0 +1,24 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library engine.index.local_file_index;
+
+import 'dart:io';
+
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/src/index/local_index.dart';
+import 'package:analysis_services/src/index/store/codec.dart';
+import 'package:analysis_services/src/index/store/separate_file_manager.dart';
+import 'package:analysis_services/src/index/store/split_store.dart';
+import 'package:analyzer/src/generated/engine.dart';
+
+
+Index createLocalFileIndex(Directory directory) {
+  var fileManager = new SeparateFileManager(directory);
+  var stringCodec = new StringCodec();
+  var nodeManager = new FileNodeManager(fileManager,
+      AnalysisEngine.instance.logger, stringCodec, new ContextCodec(),
+      new ElementCodec(stringCodec), new RelationshipCodec(stringCodec));
+  return new LocalIndex(nodeManager);
+}
diff --git a/pkg/analysis_services/lib/index/local_memory_index.dart b/pkg/analysis_services/lib/index/local_memory_index.dart
new file mode 100644
index 00000000000..7f4c8fa944b
--- /dev/null
+++ b/pkg/analysis_services/lib/index/local_memory_index.dart
@@ -0,0 +1,14 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library engine.index.memory_file_index;
+
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/src/index/local_index.dart';
+import 'package:analysis_services/src/index/store/memory_node_manager.dart';
+
+
+Index createLocalMemoryIndex() {
+  return new LocalIndex(new MemoryNodeManager());
+}
diff --git a/pkg/analyzer/lib/search/search_engine.dart b/pkg/analysis_services/lib/search/search_engine.dart
similarity index 100%
rename from pkg/analyzer/lib/search/search_engine.dart
rename to pkg/analysis_services/lib/search/search_engine.dart
diff --git a/pkg/analyzer/lib/src/index/index_contributor.dart b/pkg/analysis_services/lib/src/index/index_contributor.dart
similarity index 99%
rename from pkg/analyzer/lib/src/index/index_contributor.dart
rename to pkg/analysis_services/lib/src/index/index_contributor.dart
index 4020293ce09..a6cf5cb7f02 100644
--- a/pkg/analyzer/lib/src/index/index_contributor.dart
+++ b/pkg/analysis_services/lib/src/index/index_contributor.dart
@@ -5,12 +5,12 @@
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
-library engine.src.index_contributor;
+library services.src.index.index_contributor;
 
 import 'dart:collection' show Queue;
 
-import 'package:analyzer/index/index.dart';
-import 'package:analyzer/index/index_store.dart';
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/index/index_store.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
diff --git a/pkg/analyzer/lib/src/index/local_index.dart b/pkg/analysis_services/lib/src/index/local_index.dart
similarity index 69%
rename from pkg/analyzer/lib/src/index/local_index.dart
rename to pkg/analysis_services/lib/src/index/local_index.dart
index 08e035d59fc..447cd222293 100644
--- a/pkg/analyzer/lib/src/index/local_index.dart
+++ b/pkg/analysis_services/lib/src/index/local_index.dart
@@ -2,37 +2,18 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library engine.src.index.local_index;
+library services.src.index.local_index;
 
 import 'dart:async';
-import 'dart:io';
 
-import 'package:analyzer/index/index.dart';
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/src/index/index_contributor.dart' as contributors;
+import 'package:analysis_services/src/index/store/split_store.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/html.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/index/index_contributor.dart' as contributors;
-import 'package:analyzer/src/index/store/codec.dart';
-import 'package:analyzer/src/index/store/memory_node_manager.dart';
-import 'package:analyzer/src/index/store/separate_file_manager.dart';
-import 'package:analyzer/src/index/store/split_store.dart';
-
-
-Index createLocalFileSplitIndex(Directory directory) {
-  var fileManager = new SeparateFileManager(directory);
-  var stringCodec = new StringCodec();
-  var nodeManager = new FileNodeManager(fileManager,
-      AnalysisEngine.instance.logger, stringCodec, new ContextCodec(),
-      new ElementCodec(stringCodec), new RelationshipCodec(stringCodec));
-  return new LocalIndex(nodeManager);
-}
-
-
-Index createLocalMemorySplitIndex() {
-  return new LocalIndex(new MemoryNodeManager());
-}
 
 
 /**
diff --git a/pkg/analyzer/lib/src/index/store/codec.dart b/pkg/analysis_services/lib/src/index/store/codec.dart
similarity index 97%
rename from pkg/analyzer/lib/src/index/store/codec.dart
rename to pkg/analysis_services/lib/src/index/store/codec.dart
index 770dada4702..9153e6988f0 100644
--- a/pkg/analyzer/lib/src/index/store/codec.dart
+++ b/pkg/analysis_services/lib/src/index/store/codec.dart
@@ -2,14 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library engine.src.index.store.codec;
+library services.src.index.store.codec;
 
 import 'dart:collection';
 
-import 'package:analyzer/index/index.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/index/store/collection.dart';
+import 'package:analysis_services/src/index/store/collection.dart';
+import 'package:analysis_services/index/index.dart';
 
 
 /**
diff --git a/pkg/analyzer/lib/src/index/store/collection.dart b/pkg/analysis_services/lib/src/index/store/collection.dart
similarity index 98%
rename from pkg/analyzer/lib/src/index/store/collection.dart
rename to pkg/analysis_services/lib/src/index/store/collection.dart
index 27b6cf6bb0b..9002aa9ca10 100644
--- a/pkg/analyzer/lib/src/index/store/collection.dart
+++ b/pkg/analysis_services/lib/src/index/store/collection.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library engine.src.index.store.collection;
+library services.src.index.store.collection;
 
 import 'dart:collection';
 import 'dart:typed_data';
diff --git a/pkg/analyzer/lib/src/index/store/memory_node_manager.dart b/pkg/analysis_services/lib/src/index/store/memory_node_manager.dart
similarity index 92%
rename from pkg/analyzer/lib/src/index/store/memory_node_manager.dart
rename to pkg/analysis_services/lib/src/index/store/memory_node_manager.dart
index 2d9baee4563..1de944f96bb 100644
--- a/pkg/analyzer/lib/src/index/store/memory_node_manager.dart
+++ b/pkg/analysis_services/lib/src/index/store/memory_node_manager.dart
@@ -2,14 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library engine.src.index.store_memory_node_manager;
+library services.src.index.store.store_memory_node_manager;
 
 import 'dart:async';
 import 'dart:collection';
 
+import 'package:analysis_services/src/index/store/codec.dart';
+import 'package:analysis_services/src/index/store/split_store.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/index/store/codec.dart';
-import 'package:analyzer/src/index/store/split_store.dart';
 
 
 class MemoryNodeManager implements NodeManager {
diff --git a/pkg/analyzer/lib/src/index/store/separate_file_manager.dart b/pkg/analysis_services/lib/src/index/store/separate_file_manager.dart
similarity index 90%
rename from pkg/analyzer/lib/src/index/store/separate_file_manager.dart
rename to pkg/analysis_services/lib/src/index/store/separate_file_manager.dart
index c927b66e854..5a51cfa5e88 100644
--- a/pkg/analyzer/lib/src/index/store/separate_file_manager.dart
+++ b/pkg/analysis_services/lib/src/index/store/separate_file_manager.dart
@@ -2,12 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library engine.src.index.store.separate_file_mananer;
+library services.src.index.store.separate_file_mananer;
 
 import 'dart:async';
 import 'dart:io';
 
-import 'package:analyzer/src/index/store/split_store.dart';
+import 'package:analysis_services/src/index/store/split_store.dart';
 import 'package:path/path.dart' as pathos;
 
 
diff --git a/pkg/analyzer/lib/src/index/store/split_store.dart b/pkg/analysis_services/lib/src/index/store/split_store.dart
similarity index 98%
rename from pkg/analyzer/lib/src/index/store/split_store.dart
rename to pkg/analysis_services/lib/src/index/store/split_store.dart
index 10aa57e36d6..49e3ba051c5 100644
--- a/pkg/analyzer/lib/src/index/store/split_store.dart
+++ b/pkg/analysis_services/lib/src/index/store/split_store.dart
@@ -2,21 +2,21 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library engine.src.index.split_store;
+library services.src.index.store.split_store;
 
 import 'dart:async';
 import 'dart:collection';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:analyzer/index/index.dart';
-import 'package:analyzer/index/index_store.dart';
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/index/index_store.dart';
+import 'package:analysis_services/src/index/store/codec.dart';
+import 'package:analysis_services/src/index/store/collection.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/index/store/codec.dart';
-import 'package:analyzer/src/index/store/collection.dart';
 
 
 /**
diff --git a/pkg/analyzer/lib/src/search/search_engine.dart b/pkg/analysis_services/lib/src/search/search_engine.dart
similarity index 99%
rename from pkg/analyzer/lib/src/search/search_engine.dart
rename to pkg/analysis_services/lib/src/search/search_engine.dart
index e23aa9db4ba..b9419b94a4d 100644
--- a/pkg/analyzer/lib/src/search/search_engine.dart
+++ b/pkg/analysis_services/lib/src/search/search_engine.dart
@@ -5,7 +5,7 @@
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
-library engine.src.search_engine;
+library services.src.search.search_engine;
 
 ///**
 // * Instances of the class <code>AndSearchPattern</code> implement a search pattern that matches
diff --git a/pkg/analysis_services/pubspec.yaml b/pkg/analysis_services/pubspec.yaml
index ae53b9d83a7..2ac7737ee8e 100644
--- a/pkg/analysis_services/pubspec.yaml
+++ b/pkg/analysis_services/pubspec.yaml
@@ -1,12 +1,12 @@
 name: analysis_services
-version: 0.0.3
+version: 0.1.0
 author: Dart Team <misc@dartlang.org>
 description: A set of services on top of Analysis Engine
 homepage: http://www.dartlang.org
 environment:
   sdk: '>=1.0.0 <2.0.0'
 dependencies:
-  analyzer: '>=0.15.1 <0.16.0'
+  analyzer: '>=0.21.0 <1.0.0'
 dev_dependencies:
-  analysis_testing: '>=0.1.0 <0.2.0'
+  analysis_testing: '>=0.1.0 <1.0.0'
   unittest: '>=0.10.0 <0.12.0'
diff --git a/pkg/analyzer/test/index/local_index_test.dart b/pkg/analysis_services/test/index/local_index_test.dart
similarity index 99%
rename from pkg/analyzer/test/index/local_index_test.dart
rename to pkg/analysis_services/test/index/local_index_test.dart
index c21ea6660be..9535f484d91 100644
--- a/pkg/analyzer/test/index/local_index_test.dart
+++ b/pkg/analysis_services/test/index/local_index_test.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index;
+library test.services.src.index.local_index;
 
 //import 'dart:async';
 //import 'dart:io' show Directory;
diff --git a/pkg/analyzer/test/index/store/codec_test.dart b/pkg/analysis_services/test/index/store/codec_test.dart
similarity index 97%
rename from pkg/analyzer/test/index/store/codec_test.dart
rename to pkg/analysis_services/test/index/store/codec_test.dart
index 0d498ad5248..1b4dc6aa0fa 100644
--- a/pkg/analyzer/test/index/store/codec_test.dart
+++ b/pkg/analysis_services/test/index/store/codec_test.dart
@@ -2,14 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index.store.codec;
+library test.services.src.index.store.codec;
 
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/src/index/store/codec.dart';
 import 'package:analysis_testing/mocks.dart';
 import 'package:analysis_testing/reflective_tests.dart';
-import 'package:analyzer/index/index.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/index/store/codec.dart';
 import 'package:typed_mock/typed_mock.dart';
 import 'package:unittest/unittest.dart';
 
diff --git a/pkg/analyzer/test/index/store/collection_test.dart b/pkg/analysis_services/test/index/store/collection_test.dart
similarity index 93%
rename from pkg/analyzer/test/index/store/collection_test.dart
rename to pkg/analysis_services/test/index/store/collection_test.dart
index 636b0a3151b..5868886c332 100644
--- a/pkg/analyzer/test/index/store/collection_test.dart
+++ b/pkg/analysis_services/test/index/store/collection_test.dart
@@ -2,10 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index.store.collection;
+library test.services.src.index.store.collection;
 
+import 'package:analysis_services/src/index/store/collection.dart';
 import 'package:analysis_testing/reflective_tests.dart';
-import 'package:analyzer/src/index/store/collection.dart';
 import 'package:unittest/unittest.dart';
 
 
diff --git a/pkg/analyzer/test/index/store/mocks.dart b/pkg/analysis_services/test/index/store/mocks.dart
similarity index 87%
rename from pkg/analyzer/test/index/store/mocks.dart
rename to pkg/analysis_services/test/index/store/mocks.dart
index 808264a1087..8505114b848 100644
--- a/pkg/analyzer/test/index/store/mocks.dart
+++ b/pkg/analysis_services/test/index/store/mocks.dart
@@ -2,11 +2,11 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.index.store.mocks;
+library test.services.index.store.mocks;
 
-import 'package:analyzer/index/index.dart';
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/src/index/store/codec.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/index/store/codec.dart';
 import 'package:typed_mock/typed_mock.dart';
 
 
diff --git a/pkg/analyzer/test/index/store/separate_file_manager_test.dart b/pkg/analysis_services/test/index/store/separate_file_manager_test.dart
similarity index 93%
rename from pkg/analyzer/test/index/store/separate_file_manager_test.dart
rename to pkg/analysis_services/test/index/store/separate_file_manager_test.dart
index 810a918ec91..a42a1dc46dd 100644
--- a/pkg/analyzer/test/index/store/separate_file_manager_test.dart
+++ b/pkg/analysis_services/test/index/store/separate_file_manager_test.dart
@@ -2,12 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index.store.separate_file_mananer;
+library test.services.src.index.store.separate_file_mananer;
 
 import 'dart:io';
 
+import 'package:analysis_services/src/index/store/separate_file_manager.dart';
 import 'package:analysis_testing/reflective_tests.dart';
-import 'package:analyzer/src/index/store/separate_file_manager.dart';
 import 'package:path/path.dart';
 import 'package:unittest/unittest.dart';
 
diff --git a/pkg/analyzer/test/index/store/single_source_container.dart b/pkg/analysis_services/test/index/store/single_source_container.dart
similarity index 89%
rename from pkg/analyzer/test/index/store/single_source_container.dart
rename to pkg/analysis_services/test/index/store/single_source_container.dart
index e2b8f2ee740..a7c7a940b2a 100644
--- a/pkg/analyzer/test/index/store/single_source_container.dart
+++ b/pkg/analysis_services/test/index/store/single_source_container.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index.store_single_source_container;
+library test.services.src.index.store.single_source_container;
 
 import 'package:analyzer/src/generated/source.dart';
 
diff --git a/pkg/analyzer/test/index/store/split_store_test.dart b/pkg/analysis_services/test/index/store/split_store_test.dart
similarity index 99%
rename from pkg/analyzer/test/index/store/split_store_test.dart
rename to pkg/analysis_services/test/index/store/split_store_test.dart
index f752f9bce21..51c44747b85 100644
--- a/pkg/analyzer/test/index/store/split_store_test.dart
+++ b/pkg/analysis_services/test/index/store/split_store_test.dart
@@ -2,19 +2,19 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index.split_store;
+library test.services.src.index.store.split_store;
 
 import 'dart:async';
 
+import 'package:analysis_services/index/index.dart';
+import 'package:analysis_services/src/index/store/codec.dart';
+import 'package:analysis_services/src/index/store/memory_node_manager.dart';
+import 'package:analysis_services/src/index/store/split_store.dart';
 import 'package:analysis_testing/mocks.dart';
 import 'package:analysis_testing/reflective_tests.dart';
-import 'package:analyzer/index/index.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/index/store/codec.dart';
-import 'package:analyzer/src/index/store/memory_node_manager.dart';
-import 'package:analyzer/src/index/store/split_store.dart';
 import 'package:typed_mock/typed_mock.dart';
 import 'package:unittest/unittest.dart';
 
diff --git a/pkg/analyzer/test/index/store/test_all.dart b/pkg/analysis_services/test/index/store/test_all.dart
similarity index 94%
rename from pkg/analyzer/test/index/store/test_all.dart
rename to pkg/analysis_services/test/index/store/test_all.dart
index fb01bc64b4d..e0a8d1ff62c 100644
--- a/pkg/analyzer/test/index/store/test_all.dart
+++ b/pkg/analysis_services/test/index/store/test_all.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index.store;
+library test.services.src.index.store;
 
 import 'package:unittest/unittest.dart';
 
diff --git a/pkg/analyzer/test/index/test_all.dart b/pkg/analysis_services/test/index/test_all.dart
similarity index 93%
rename from pkg/analyzer/test/index/test_all.dart
rename to pkg/analysis_services/test/index/test_all.dart
index a7390aaa3d4..f2e557894b9 100644
--- a/pkg/analyzer/test/index/test_all.dart
+++ b/pkg/analysis_services/test/index/test_all.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.engine.src.index.all;
+library test.services.src.index.all;
 
 import 'package:unittest/unittest.dart';
 
diff --git a/pkg/analyzer/test/search/search_engine_test.dart b/pkg/analysis_services/test/search/search_engine_test.dart
similarity index 100%
rename from pkg/analyzer/test/search/search_engine_test.dart
rename to pkg/analysis_services/test/search/search_engine_test.dart
diff --git a/pkg/analysis_services/test/test_all.dart b/pkg/analysis_services/test/test_all.dart
index fb2208646c7..ee8b415e0b3 100644
--- a/pkg/analysis_services/test/test_all.dart
+++ b/pkg/analysis_services/test/test_all.dart
@@ -4,8 +4,10 @@
 
 import 'package:unittest/unittest.dart';
 
+import 'index/test_all.dart' as index_all;
+
 /// Utility for manually running all tests.
 main() {
-//  group('analysis_services', () {
-//  });
+  groupSep = ' | ';
+  index_all.main();
 }
\ No newline at end of file
diff --git a/pkg/analysis_testing/pubspec.yaml b/pkg/analysis_testing/pubspec.yaml
index e4d30971902..9ffbf9859a9 100644
--- a/pkg/analysis_testing/pubspec.yaml
+++ b/pkg/analysis_testing/pubspec.yaml
@@ -6,6 +6,6 @@ homepage: http://www.dartlang.org
 environment:
   sdk: '>=1.0.0 <2.0.0'
 dependencies:
-  analyzer: '>=0.19.0 <1.0.0'
-  typed_mock: '>=0.0.4 <0.1.0'
+  analyzer: '>=0.21.0 <1.0.0'
+  typed_mock: '>=0.0.4 <1.0.0'
   unittest: '>=0.10.0 <0.12.0'
diff --git a/pkg/analyzer/pubspec.yaml b/pkg/analyzer/pubspec.yaml
index 95ed86a64de..eabd3888db1 100644
--- a/pkg/analyzer/pubspec.yaml
+++ b/pkg/analyzer/pubspec.yaml
@@ -1,5 +1,5 @@
 name: analyzer
-version: 0.20.0
+version: 0.21.0
 author: Dart Team <misc@dartlang.org>
 description: Static analyzer for Dart.
 homepage: http://www.dartlang.org
@@ -11,6 +11,5 @@ dependencies:
   path: '>=0.9.0 <2.0.0'
   watcher: '>=0.9.0 <0.10.0'
 dev_dependencies:
-  analysis_testing: '>=0.1.0 <0.2.0'
-  typed_mock: '>=0.0.4 <0.1.0'
+  typed_mock: '>=0.0.4 <1.0.0'
   unittest: '>=0.9.0 <0.12.0'