@@ -337,11 +337,12 @@ private Stream<CompletionItem> notImportedConstructors(String partialIdentifier,
      * Suggest classes that haven't yet been imported, but are on the source or class path
      */
     private Stream<CompletionItem> notImportedClasses(String partialIdentifier, Scope scope) {
-        Stream<CompletionItem> fromClassPath = accessibleClassPathClasses(partialIdentifier, scope)
-                .map(this::completeClassNameFromClassPath);
-        // TODO sourcePath
+        Stream<String> fromSourcePath = accessibleSourcePathClasses(partialIdentifier, scope);
+        Stream<String> fromClassPath = accessibleClassPathClasses(partialIdentifier, scope)
+                .map(c -> c.getName());
 
-        return fromClassPath;
+        return Stream.concat(fromSourcePath, fromClassPath)
+                .map(this::completeClassNameFromClassPath);
     }
 
     private Stream<ClassPath.ClassInfo> accessibleClassPathClasses(String partialIdentifier, Scope scope) {
@@ -352,6 +353,13 @@ private Stream<ClassPath.ClassInfo> accessibleClassPathClasses(String partialIde
                 .filter(c -> classPath.isAccessibleFromPackage(c, packageName));
     }
 
+    private Stream<String> accessibleSourcePathClasses(String partialIdentifier, Scope scope) {
+        String packageName = packageName(scope);
+
+        return sourcePath.accessibleTopLevelClasses(packageName)
+                .filter(c -> containsCharactersInOrder(lastId(c), partialIdentifier));
+    }
+
     private String packageName(Scope scope) {
         PackageElement packageEl = elements.getPackageOf(scope.getEnclosingClass());
 
@@ -575,15 +583,16 @@ private CompletionItem completeConstructorFromClassPath(Constructor<?> c) {
         return item;
     }
 
-    private CompletionItem completeClassNameFromClassPath(ClassPath.ClassInfo info) {
+    private CompletionItem completeClassNameFromClassPath(String qualifiedName) {
         CompletionItem item = new CompletionItem();
-
-        item.setLabel(info.getSimpleName());
-        item.setDetail(info.getPackageName());
-        item.setInsertText(info.getSimpleName());
-        item.setAdditionalTextEdits(addImport(info.getName()));
-        item.setSortText("2/" + info.getSimpleName());
-        item.setData(info.getName());
+        String packageName = mostIds(qualifiedName), simpleName = lastId(qualifiedName);
+
+        item.setLabel(simpleName);
+        item.setDetail(packageName);
+        item.setInsertText(simpleName);
+        item.setAdditionalTextEdits(addImport(qualifiedName));
+        item.setSortText("2/" + simpleName);
+        item.setData(qualifiedName);
 
         // TODO implement vscode resolve-completion-item
 
 
@@ -179,6 +179,18 @@ private void addDeclaration() {
         });
     }
 
+    public Stream<String> accessibleTopLevelClasses(String fromPackage) {
+        finishedInitialIndex.join();
+
+        return sourcePathFiles.values().stream()
+                .flatMap(index -> {
+                    return Stream.concat(
+                        index.publicTopLevelClasses.stream(), 
+                        index.packagePrivateTopLevelClasses.stream().filter(name -> Completions.mostIds(name).equals(fromPackage))
+                    );
+                });
+    }
+
     public Stream<String> allTopLevelClasses() {
         finishedInitialIndex.join();
 
 
@@ -554,6 +554,23 @@ public void importClass() throws IOException {
         }
     }
 
+    @Test
+    public void otherPackageId() throws IOException {
+        String file = "/org/javacs/example/AutocompleteOtherPackage.java";
+
+        // Static methods
+        List<? extends CompletionItem> items = items(file, 5, 14);
+        List<String> suggestions = Lists.transform(items, i -> i.getLabel());
+
+        assertThat(suggestions, hasItems("OtherPackagePublic"));
+        assertThat(suggestions, not(hasItems("OtherPackagePrivate")));
+
+        for (CompletionItem item : items) {
+            if (item.getLabel().equals("OtherPackagePublic"))
+                assertThat("Auto-import OtherPackagePublic", item.getAdditionalTextEdits(), not(empty()));
+        }
+    }
+
     @Test
     public void fieldFromStaticInner() throws IOException {
         String file = "/org/javacs/example/AutocompleteOuter.java";
 
@@ -0,0 +1,7 @@
+package org.javacs.example;
+
+public class AutocompleteOtherPackage {
+    public void test() {
+        Other
+    }
+}