diff --git a/build.gradle.kts b/build.gradle.kts
index 75171ecf0..b1855e276 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -70,7 +70,7 @@ version = pluginVersion
 plugins {
     id("java")
     kotlin("jvm") version "1.9.22"
-    id("org.jetbrains.intellij.platform") version "2.0.0-rc1"
+    id("org.jetbrains.intellij.platform") version "2.0.0"
     id("org.jetbrains.grammarkit") version "2022.3.2.2"
     id("net.saliman.properties") version "1.5.2"
     id("org.gradle.idea")
@@ -106,7 +106,7 @@ allprojects {
         intellijPlatform {
             create(prop("platformType"), prop("platformVersion"), useInstaller = useInstaller)
             testFramework(TestFrameworkType.Platform)
-            pluginVerifier()
+            pluginVerifier("1.371")
             bundledPlugin("org.toml.lang")
             jetbrainsRuntimeExplicit("jbr_jcef-17.0.11-linux-x64-b1207.30")
         }
@@ -160,7 +160,7 @@ allprojects {
             channels.set(listOf(publishingChannel))
         }
 
-        verifyPlugin {
+        pluginVerification {
             ides {
                 recommended()
             }
diff --git a/gradle.properties b/gradle.properties
index 4069694ba..522f940f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,6 +18,6 @@ jbrVersion=17.0.7b1000.6
 propertiesPluginEnvironmentNameProperty=shortPlatformVersion
 # properties files
 # pass ORG_GRADLE_PROJECT_shortPlatformVersion environment variable to overwrite
-shortPlatformVersion=242
+shortPlatformVersion=233
 
 useInstaller=true
diff --git a/src/main/grammars/MoveParser.bnf b/src/main/grammars/MoveParser.bnf
index 919dd60d5..0dd885318 100644
--- a/src/main/grammars/MoveParser.bnf
+++ b/src/main/grammars/MoveParser.bnf
@@ -159,7 +159,7 @@
 //   * recovery related rules are PascalCase_with_snake_suffix: Item_recover
 File ::= (NamedAddressDef | Script | AddressDef | Module | ModuleSpec)*
 
-QualPathCodeFragmentElement ::= FQModulePathIdent? TypeArgumentList?
+QualPathCodeFragmentElement ::= PathImpl
 
 Attr ::= '#' '[' <<non_empty_comma_sep_items AttrItem>> ']' { pin = 1 }
 AttrItem ::= IDENTIFIER (AttrItemList | AttrItemInitializer)?
@@ -185,7 +185,7 @@ Script ::= SCRIPT_KW ScriptBlock { pin = 1 }
 ScriptBlock ::= '{' ScriptBlockItems '}' {
     pin = 1
     implements = [
-        "org.move.lang.core.psi.MvImportsOwner"
+        "org.move.lang.core.psi.ext.MvItemsOwner"
     ]
 }
 private ScriptBlockItems ::= ScriptItem*
@@ -241,7 +241,7 @@ ModuleBlock ::= '{' ModuleBlockItems '}'
 {
     pin = 1
     implements = [
-        "org.move.lang.core.psi.MvImportsOwner"
+        "org.move.lang.core.psi.ext.MvItemsOwner"
     ]
 }
 private ModuleBlockItems ::= ModuleItem*
@@ -255,6 +255,7 @@ private Item_first ::= use | public | native | fun | CONST_KW | STRUCT_KW | spec
 private Item_recover ::= !('}' | <<eof>> | Item_first)
 
 private ModuleItem_item ::= UseStmt
+//                            | UseStmt
                             | FriendDecl
                             | StructItem
                             | FunctionItem
@@ -269,8 +270,7 @@ Const ::= Attr* CONST_KW IDENTIFIER TypeAnnotation Initializer ';'
     pin = "CONST_KW"
     implements = [
         "org.move.lang.core.psi.MvQualNamedElement"
-        "org.move.lang.core.psi.MvNameIdentifierOwner"
-        "org.move.lang.core.psi.ext.MvDocAndAttributeOwner"
+        "org.move.lang.core.psi.ext.MvItemElement"
         "org.move.lang.core.psi.MvTypeAnnotationOwner"
     ]
     mixin = "org.move.lang.core.psi.ext.MvConstMixin"
@@ -289,6 +289,7 @@ fake SpecFunction ::= Attr* spec native? fun IDENTIFIER? TypeParameterList?
     implements = [
         "org.move.lang.core.psi.MvQualNamedElement"
         "org.move.lang.core.psi.MvFunctionLike"
+        "org.move.lang.core.psi.ext.MvItemElement"
         "org.move.lang.core.types.infer.MvInferenceContextOwner"
         "org.move.lang.core.psi.ScopeMslOnlyElement"
     ]
@@ -320,6 +321,7 @@ fake SpecInlineFunction ::= Attr* native? fun IDENTIFIER? TypeParameterList?
     implements = [
         "org.move.lang.core.psi.MvFunctionLike"
         "org.move.lang.core.types.infer.MvInferenceContextOwner"
+        "org.move.lang.core.psi.ext.MvItemElement"
         "org.move.lang.core.psi.ScopeMslOnlyElement"
     ]
     mixin = "org.move.lang.core.psi.ext.MvSpecInlineFunctionMixin"
@@ -355,9 +357,8 @@ fake Struct ::= Attr* native? STRUCT_KW IDENTIFIER? TypeParameterList? Abilities
 {
     implements = [
         "org.move.lang.core.psi.MvQualNamedElement"
-        "org.move.lang.core.psi.ext.MvDocAndAttributeOwner"
         "org.move.lang.core.psi.MvTypeParametersOwner"
-        "org.move.lang.core.psi.MvNameIdentifierOwner"
+        "org.move.lang.core.psi.ext.MvItemElement"
     ]
     mixin = "org.move.lang.core.psi.ext.MvStructMixin"
     stubClass = "org.move.lang.core.stubs.MvStructStub"
@@ -389,6 +390,7 @@ fake Function ::= Attr* native? VisibilityModifier? entry? inline?
     implements = [
         "org.move.lang.core.psi.MvQualNamedElement"
         "org.move.lang.core.psi.MvFunctionLike"
+        "org.move.lang.core.psi.ext.MvItemElement"
         "org.move.lang.core.types.infer.MvInferenceContextOwner"
         "org.move.lang.core.psi.MvModificationTrackerOwner"
     ]
@@ -465,17 +467,17 @@ ResourceAccessItemList ::= <<isResourceAccessEnabled>> ResourceAccessItem*
 ResourceAccessItem ::= pure | (('!')? (acquires | reads | writes) AccessSpecifierList)
 
 AccessSpecifierList ::= <<non_empty_comma_sep_items AccessSpecifier>>
-AccessSpecifier ::= <<pathMode 'WILDCARD' Path>> AddressSpecifier?
+AccessSpecifier ::= <<pathMode 'WILDCARD' PathImpl>> AddressSpecifier?
 
 AddressSpecifier ::= '(' AddressSpecifierArg ')' { pin = 1 }
 AddressSpecifierArg ::= '*'
                         | AddressSpecifierLit
-                        | <<pathMode 'VALUE' (Path '(' AddressSpecifierCallParam ')')>>
+                        | <<pathMode 'VALUE' (PathImpl '(' AddressSpecifierCallParam ')')>>
                         | IDENTIFIER
 AddressSpecifierLit ::= DIEM_ADDRESS | INTEGER_LITERAL
 
-AddressSpecifierCallParam ::= AddressSpecifierParamPath
-AddressSpecifierParamPath ::= LocalPathIdent { elementType = Path }
+AddressSpecifierCallParam ::= AddressSpecifierCallParamImpl
+AddressSpecifierCallParamImpl ::= PathIdent { elementType = Path }
 
 // acquires T, Record
 AcquiresType ::= acquires AcquiresType_items { pin = 1 }
@@ -511,53 +513,32 @@ StructField ::= Attr* IDENTIFIER TypeAnnotation &(',' | '}')
     hooks = [ leftBinder = "ADJACENT_LINE_COMMENTS" ]
 }
 
-FriendDecl ::= Attr* friend FQModuleRef ';'
+FriendDecl ::= Attr* friend PathImpl ';'
 {
     pin = "friend"
     implements = [ "org.move.lang.core.psi.ext.MvDocAndAttributeOwner" ]
 }
 
-UseStmt ::= Attr* use (ItemUseSpeck | ModuleUseSpeck) ';' {
+UseStmt ::= Attr* use UseSpeck ';' {
     pin = "use"
+    extends = Stmt
     implements = [ "org.move.lang.core.psi.ext.MvDocAndAttributeOwner" ]
 }
-ModuleUseSpeck ::= (AddressRef !'::') | FQModuleRef UseAlias?
-{
-    name = "qual path to module"
-    implements = [
-        "org.move.lang.core.psi.MvNamedElement"
-//        "org.move.lang.core.psi.MvUseSpeck"
-    ]
-    mixin = "org.move.lang.core.psi.ext.MvModuleUseSpeckMixin"
-}
-ItemUseSpeck ::= FQModuleRef '::' (UseItem | UseItemGroup)
-{
-    pin = 2
-    name = "qual path to imported item"
-//    implements = [
-//        "org.move.lang.core.psi.MvUseSpeck"
-//    ]
-}
+UseSpeck ::= PathImpl ( UseAlias | ('::' UseGroup) )?
 
-UseItemGroup ::= '{' <<non_empty_comma_sep_items MultiItemUse_member_with_recovery>>? '}'
-{
-    pin = 1
-}
-private MultiItemUse_member_with_recovery ::= !('}' | ';' | <<eof>>) UseItem
+UseGroup ::= '{' UseSpeck_with_recover* '}'
 {
     pin = 1
 }
+// todo:
+private PathWithoutTypeArgs ::= PathImpl
 
-UseItem ::= IDENTIFIER UseAlias?
-{
-    pin = 1
-    name = "item name"
-    implements = [
-        "org.move.lang.core.psi.MvNamedElement"
-        "org.move.lang.core.resolve.ref.MvMandatoryReferenceElement"
-    ]
-    mixin = "org.move.lang.core.psi.ext.MvUseItemMixin"
+private UseSpeck_with_recover ::= !'}' UseSpeck (','|&'}') {
+  pin = 1
+  recoverWhile = UseSpeck_recover
 }
+private UseSpeck_recover ::= !('}' | '{' | IDENTIFIER | '::' )
+
 UseAlias ::= as IDENTIFIER
 {
     pin = 1
@@ -583,7 +564,7 @@ RefType ::= RefTypeStart Type
 }
 RefTypeStart ::= '&' mut?
 
-PathType ::= Path
+PathType ::= PathImpl
 {
     name = "type"
 }
@@ -657,7 +638,7 @@ BindingPat ::= IDENTIFIER {
 
 TuplePat ::= '(' <<non_empty_comma_sep_items Pat>>? ')'
 
-StructPat ::= Path StructPatFieldsBlock
+StructPat ::= PathImpl StructPatFieldsBlock
 StructPatFieldsBlock ::= '{' StructPatField_with_recover* '}' { pin = 1 }
 
 private StructPatField_with_recover ::= !'}' StructPatField (',' | &'}')
@@ -672,7 +653,7 @@ StructPatField ::= (BindingPat !':') | (IDENTIFIER StructPatFieldBinding)
 {
     implements = [
         "org.move.lang.core.resolve.ref.MvStructPatFieldReferenceElement"
-        "org.move.lang.core.resolve.ref.MvStructRefField"
+        "org.move.lang.core.psi.ext.MvStructRefField"
     ]
     mixin = "org.move.lang.core.psi.ext.MvStructPatFieldMixin"
 }
@@ -745,7 +726,7 @@ CodeBlock ::= '{' CodeBlock_items '}'
 {
     pin = 1
     implements = [
-        "org.move.lang.core.psi.MvImportsOwner"
+        "org.move.lang.core.psi.ext.MvItemsOwner"
         "org.move.lang.core.psi.AnyBlock"
     ]
     mixin = "org.move.lang.core.psi.ext.MvCodeBlockMixin"
@@ -903,7 +884,7 @@ VectorLitItems ::= '[' <<non_empty_comma_sep_items Expr>>? ']'
     pin = 1
 }
 
-StructLitExpr ::= <<includeStmtModeFalse>> Path StructLitFieldsBlock
+StructLitExpr ::= <<includeStmtModeFalse>> PathImpl StructLitFieldsBlock
 {
     implements = ["org.move.lang.core.psi.PathExpr"]
 }
@@ -920,7 +901,7 @@ StructLitField ::= IDENTIFIER StructLitFieldInit?
 {
     implements = [
         "org.move.lang.core.resolve.ref.MvStructFieldLitReferenceElement"
-        "org.move.lang.core.resolve.ref.MvStructRefField"
+        "org.move.lang.core.psi.ext.MvStructRefField"
     ]
     mixin = "org.move.lang.core.psi.ext.MvStructLitFieldMixin"
 }
@@ -965,7 +946,7 @@ private AnyLitToken_first ::= HEX_INTEGER_LITERAL
 
 AddressLit ::= '@' AddressRef { pin = 1 }
 
-CallExpr ::= (Path &'(') ValueArgumentList {
+CallExpr ::= (PathImpl &'(') ValueArgumentList {
     pin = 1
     implements = [
         "org.move.lang.core.psi.PathExpr"
@@ -1045,47 +1026,61 @@ IndexExpr ::= Expr IndexArg
 // Do not inline this rule, it breaks expression parsing
 private IndexArg ::= '[' Expr ']'
 
-RefExpr ::= Path !'{' {
+RefExpr ::= PathImpl !'{' {
+//RefExpr ::= Path !'{' {
     implements = ["org.move.lang.core.psi.PathExpr"]
 }
 
-Path ::= (ModulePathIdent | FQModulePathIdent | LocalPathIdent) TypeArgumentList?
+//Path3Impl ::= (ModulePathIdent | FQModulePathIdent | LocalPathIdent) TypeArgumentList?
+//{
+//    implements = [
+//        "org.move.lang.core.resolve.ref.MvPathReferenceElement"
+//        "org.move.lang.core.psi.ext.MvMethodOrPath"
+//    ]
+//    mixin = "org.move.lang.core.psi.ext.MvPathMixin"
+//}
+
+fake Path ::= (Path '::')? (PathIdent | PathAddress) TypeArgumentList?
 {
     implements = [
-        "org.move.lang.core.resolve.ref.MvPathReferenceElement"
+        "org.move.lang.core.resolve.ref.MvNameAccessChainReferenceElement"
         "org.move.lang.core.psi.ext.MvMethodOrPath"
     ]
     mixin = "org.move.lang.core.psi.ext.MvPathMixin"
 }
 
-private LocalPathIdent ::= PATH_MODE_IDENTIFIER
-private ModulePathIdent ::= ModuleRef ('::' !(PATH_MODE_IDENTIFIER '::')) PATH_MODE_IDENTIFIER
-{
-    pin = 2
-}
-private FQModulePathIdent ::= FQModuleRef '::' PATH_MODE_IDENTIFIER
-{
-    pin = 1
-}
-private PATH_MODE_IDENTIFIER ::= (<<isPathMode 'VALUE' >> IDENTIFIER)
-                                | (<<isPathMode 'WILDCARD' >> ('*' | IDENTIFIER))
+private PathImpl ::= PathStart PathSegment*
 
-ModuleRef ::= PATH_MODE_IDENTIFIER | FQModuleRef
+PathStart ::= ((PathAddress &'::') | PathIdent) TypeArgumentList?
 {
-    implements = ["org.move.lang.core.resolve.ref.MvReferenceElement"]
-    mixin = "org.move.lang.core.psi.ext.MvModuleRefMixin"
+    name = "path"
+    elementType = Path
 }
-
-FQModuleRef ::= AddressRef '::' PATH_MODE_IDENTIFIER
-{
+// negation for UseSpeck
+left PathSegment ::= '::' !'{' PathIdent TypeArgumentList? {
     pin = 2
-    extends = ModuleRef
-    implements = [
-        "org.move.lang.core.resolve.ref.MvFQModuleReferenceElement"
-    ]
-    mixin = "org.move.lang.core.psi.ext.MvFQModuleRefMixin"
+    elementType = Path
 }
 
+private PathIdent ::= PATH_MODE_IDENTIFIER
+PathAddress ::= DIEM_ADDRESS
+                | INTEGER_LITERAL
+                | PLACEHOLDER_ADDRESS
+                | BECH32_ADDRESS
+                | POLKADOT_ADDRESS
+
+//private LocalPathIdent ::= PATH_MODE_IDENTIFIER
+//private ModulePathIdent ::= ModuleRef ('::' !(PATH_MODE_IDENTIFIER '::')) PATH_MODE_IDENTIFIER
+//{
+//    pin = 2
+//}
+//private FQModulePathIdent ::= FQModuleRef '::' PATH_MODE_IDENTIFIER
+//{
+//    pin = 1
+//}
+private PATH_MODE_IDENTIFIER ::= (<<isPathMode 'VALUE' >> IDENTIFIER)
+                                | (<<isPathMode 'WILDCARD' >> ('*' | IDENTIFIER))
+
 AddressRef ::= NamedAddress
                 | DIEM_ADDRESS
                 | INTEGER_LITERAL
@@ -1135,7 +1130,8 @@ private to ::= <<toKeyword>>
 private apply ::= <<applyKeyword>>
 private except ::= <<exceptKeyword>>
 
-ModuleSpec ::= Attr* spec FQModuleRef ModuleSpecBlock
+ModuleSpec ::= Attr* spec PathImpl ModuleSpecBlock
+//ModuleSpec ::= Attr* spec FQModuleRef ModuleSpecBlock
 {
     pin = "spec"
     name = "module spec declaration"
@@ -1148,7 +1144,7 @@ ModuleSpecBlock ::= '{' ModuleSpecBlock_item_with_recover* '}'
 {
     pin = 1
     implements = [
-        "org.move.lang.core.psi.MvImportsOwner"
+        "org.move.lang.core.psi.ext.MvItemsOwner"
         "org.move.lang.core.psi.ScopeMslOnlyElement"
         "org.move.lang.core.psi.AnyBlock"
     ]
@@ -1228,18 +1224,19 @@ ItemSpecRef ::= IDENTIFIER
     mixin = "org.move.lang.core.psi.ext.MvItemSpecRefMixin"
 }
 
-Schema ::= (spec schema) IDENTIFIER TypeParameterList? <<msl SpecCodeBlock>> {
-    pin = 1
+Schema ::= Attr* (spec schema) IDENTIFIER TypeParameterList? <<msl SpecCodeBlock>> {
+    pin = 2
     implements = [
         "org.move.lang.core.psi.MvTypeParametersOwner"
         "org.move.lang.core.psi.MvQualNamedElement"
-        "org.move.lang.core.psi.MvNameIdentifierOwner"
         "org.move.lang.core.types.infer.MvInferenceContextOwner"
         "org.move.lang.core.psi.ScopeMslOnlyElement"
+        "org.move.lang.core.psi.ext.MvItemElement"
     ]
     mixin = "org.move.lang.core.psi.ext.MvSchemaMixin"
     stubClass = "org.move.lang.core.stubs.MvSchemaStub"
     elementTypeFactory = "org.move.lang.core.stubs.StubsKt.factory"
+    hooks = [ leftBinder = "ADJACENT_LINE_COMMENTS" ]
 }
 
 ItemSpecBlockExpr ::= spec <<msl SpecCodeBlock>> {
@@ -1252,7 +1249,7 @@ SpecCodeBlock ::= '{' ItemSpecBlock_items '}'
 {
     pin = 1
     implements = [
-        "org.move.lang.core.psi.MvImportsOwner"
+        "org.move.lang.core.psi.ext.MvItemsOwner"
         "org.move.lang.core.psi.AnyBlock"
         "org.move.lang.core.psi.MslOnlyElement"
     ]
@@ -1294,13 +1291,14 @@ SchemaFieldStmt_local ::= local BindingPat TypeAnnotation ';' {
     elementType = SchemaFieldStmt
 }
 
-GlobalVariableStmt ::= global IDENTIFIER TypeParameterList? TypeAnnotation ('=' Expr)? ';'
+GlobalVariableStmt ::= Attr* global IDENTIFIER TypeParameterList? TypeAnnotation ('=' Expr)? ';'
 {
-    pin = 1
+    pin = 2
     implements = [
         "org.move.lang.core.psi.MvNameIdentifierOwner"
         "org.move.lang.core.psi.MvTypeAnnotationOwner"
         "org.move.lang.core.psi.MslOnlyElement"
+        "org.move.lang.core.psi.ext.MvItemElement"
     ]
     mixin = "org.move.lang.core.psi.ext.MvGlobalVariableMixin"
 }
@@ -1411,7 +1409,7 @@ IfElseIncludeItem ::= if Condition SchemaLit else SchemaLit
     extends = IncludeItem
 }
 
-SchemaLit ::= Path SchemaFieldsBlock?
+SchemaLit ::= PathImpl SchemaFieldsBlock?
 {
     implements = [
         "org.move.lang.core.psi.MslOnlyElement"
@@ -1499,7 +1497,7 @@ ApplyExcept ::= except <<non_empty_comma_sep_items FunctionPattern>> {
     implements = [ "org.move.lang.core.psi.MslOnlyElement" ]
 }
 
-SchemaRef ::= Path ('{' <<non_empty_comma_sep_items ApplySchemaNameAttribute>> '}')?
+SchemaRef ::= PathImpl ('{' <<non_empty_comma_sep_items ApplySchemaNameAttribute>> '}')?
 {
     implements = [ "org.move.lang.core.psi.MslOnlyElement" ]
 }
diff --git a/src/main/kotlin/org/move/cli/MoveProject.kt b/src/main/kotlin/org/move/cli/MoveProject.kt
index 6fcd74a8b..61fafdc11 100644
--- a/src/main/kotlin/org/move/cli/MoveProject.kt
+++ b/src/main/kotlin/org/move/cli/MoveProject.kt
@@ -1,5 +1,7 @@
 package org.move.cli
 
+import com.intellij.openapi.components.service
+import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.NlsContexts.Tooltip
 import com.intellij.openapi.util.UserDataHolderBase
@@ -12,6 +14,7 @@ import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker
 import org.move.cli.manifest.AptosConfigYaml
 import org.move.cli.manifest.MoveToml
+import org.move.cli.tests.NamedAddressService
 import org.move.lang.MoveFile
 import org.move.lang.core.psi.MvModule
 import org.move.lang.core.types.Address
@@ -20,6 +23,7 @@ import org.move.lang.index.MvNamedElementIndex
 import org.move.lang.toMoveFile
 import org.move.lang.toNioPathOrNull
 import org.move.openapiext.common.checkUnitTestMode
+import org.move.openapiext.common.isUnitTestMode
 import org.move.openapiext.contentRoots
 import org.move.stdext.chain
 import org.move.stdext.iterateMoveVirtualFiles
@@ -42,7 +46,7 @@ data class MoveProject(
     fun movePackages(): Sequence<MovePackage> = currentPackage.wrapWithList().chain(depPackages())
     fun depPackages(): List<MovePackage> = dependencies.map { it.first }.reversed()
 
-    fun sourceFolders(): List<VirtualFile> {
+    fun allAccessibleMoveFolders(): List<VirtualFile> {
         val folders = currentPackage.moveFolders().toMutableList()
 
         val depFolders = dependencies.asReversed().flatMap { it.first.moveFolders() }
@@ -88,6 +92,16 @@ data class MoveProject(
         return Address.Named(name, value, this)
     }
 
+    fun getNamedAddressTestAware(name: String): Address.Named? {
+        val namedAddress = getNamedAddress(name)
+        if (namedAddress != null) return namedAddress
+        if (isUnitTestMode) {
+            val namedAddressService = project.service<NamedAddressService>()
+            return namedAddressService.getNamedAddress(this, name)
+        }
+        return null
+    }
+
     fun getAddressNamesForValue(addressValue: String): List<String> {
         val addressLit = AddressLit(addressValue)
         val names = mutableListOf<String>()
@@ -102,10 +116,20 @@ data class MoveProject(
 
     fun searchScope(): GlobalSearchScope {
         var searchScope = GlobalSearchScope.EMPTY_SCOPE
-        for (folder in sourceFolders()) {
+        for (folder in allAccessibleMoveFolders()) {
             val dirScope = GlobalSearchScopes.directoryScope(project, folder, true)
             searchScope = searchScope.uniteWith(dirScope)
         }
+        if (isUnitTestMode
+            && searchScope == GlobalSearchScope.EMPTY_SCOPE
+        ) {
+            // add current file to the search scope for the tests
+            val currentFile =
+                FileEditorManager.getInstance(project).selectedTextEditor?.virtualFile
+            if (currentFile != null) {
+                searchScope = searchScope.uniteWith(GlobalSearchScope.fileScope(project, currentFile))
+            }
+        }
         return searchScope
     }
 
@@ -120,7 +144,7 @@ data class MoveProject(
     val profiles: Set<String> = this.aptosConfigYaml?.profiles.orEmpty()
 
     fun processMoveFiles(processFile: (MoveFile) -> Boolean) {
-        val folders = sourceFolders()
+        val folders = allAccessibleMoveFolders()
         var stopped = false
         for (folder in folders) {
             if (stopped) break
@@ -134,11 +158,12 @@ data class MoveProject(
     }
 
     sealed class UpdateStatus(private val priority: Int) {
-//        object UpToDate : UpdateStatus(0)
-        object NeedsUpdate : UpdateStatus(1)
-        class UpdateFailed(@Tooltip val reason: String) : UpdateStatus(2) {
+        //        object UpToDate : UpdateStatus(0)
+        object NeedsUpdate: UpdateStatus(1)
+        class UpdateFailed(@Tooltip val reason: String): UpdateStatus(2) {
             override fun toString(): String = reason
         }
+
         fun merge(status: UpdateStatus): UpdateStatus = if (priority >= status.priority) this else status
     }
 
diff --git a/src/main/kotlin/org/move/cli/settings/MvProjectSettingsService.kt b/src/main/kotlin/org/move/cli/settings/MvProjectSettingsService.kt
index 5f3e18bf2..5a6da2c89 100644
--- a/src/main/kotlin/org/move/cli/settings/MvProjectSettingsService.kt
+++ b/src/main/kotlin/org/move/cli/settings/MvProjectSettingsService.kt
@@ -127,6 +127,12 @@ fun Path?.isValidExecutable(): Boolean {
 
 fun isDebugModeEnabled(): Boolean = Registry.`is`("org.move.debug.enabled")
 
+fun debugError(message: String) {
+    if (isDebugModeEnabled()) {
+        error(message)
+    }
+}
+
 fun <T> debugErrorOrFallback(message: String, fallback: T): T {
     if (isDebugModeEnabled()) {
         error(message)
diff --git a/src/main/kotlin/org/move/cli/tests/NamedAddressService.kt b/src/main/kotlin/org/move/cli/tests/NamedAddressService.kt
new file mode 100644
index 000000000..8725dcf25
--- /dev/null
+++ b/src/main/kotlin/org/move/cli/tests/NamedAddressService.kt
@@ -0,0 +1,23 @@
+package org.move.cli.tests
+
+import org.move.cli.MoveProject
+import org.move.lang.core.types.Address
+import org.move.lang.core.types.Address.Named
+
+interface NamedAddressService {
+    fun getNamedAddress(moveProject: MoveProject, name: String): Address.Named?
+}
+
+class NamedAddressServiceImpl: NamedAddressService {
+    override fun getNamedAddress(moveProject: MoveProject, name: String): Address.Named? = null
+}
+
+
+class NamedAddressServiceTestImpl: NamedAddressService {
+    val namedAddresses: MutableMap<String, String> = mutableMapOf()
+
+    override fun getNamedAddress(moveProject: MoveProject, name: String): Named? {
+        val value = namedAddresses[name] ?: return null
+        return Named(name, value, moveProject)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/ide/annotator/HighlightingAnnotator.kt b/src/main/kotlin/org/move/ide/annotator/HighlightingAnnotator.kt
index 4a7e757f8..decacf0d5 100644
--- a/src/main/kotlin/org/move/ide/annotator/HighlightingAnnotator.kt
+++ b/src/main/kotlin/org/move/ide/annotator/HighlightingAnnotator.kt
@@ -62,8 +62,6 @@ class HighlightingAnnotator: MvAnnotatorBase() {
         if (element is MvAbility) return MvColor.ABILITY
         if (element is MvTypeParameter) return MvColor.TYPE_PARAMETER
         if (element is MvItemSpecTypeParameter) return MvColor.TYPE_PARAMETER
-        if (element is MvModuleRef && element.isSelfModuleRef) return MvColor.KEYWORD
-        if (element is MvUseItem && element.text == "Self") return MvColor.KEYWORD
         if (element is MvFunction)
             return when {
                 element.isInline -> MvColor.INLINE_FUNCTION
@@ -106,10 +104,12 @@ class HighlightingAnnotator: MvAnnotatorBase() {
     }
 
     private fun highlightPathElement(path: MvPath): MvColor? {
+        val identifierName = path.identifierName
+        if (identifierName == "Self") return MvColor.KEYWORD
+
         // any qual :: access is not highlighted
-        if (path.isQualPath) return null
+        if (path.qualifier != null) return null
 
-        val identifierName = path.identifierName
         val pathOwner = path.parent
         return when (pathOwner) {
             is MvPathType -> {
@@ -128,7 +128,7 @@ class HighlightingAnnotator: MvAnnotatorBase() {
                 }
             }
             is MvCallExpr -> {
-                val item = path.reference?.resolveWithAliases()
+                val item = path.reference?.resolveFollowingAliases()
                 when {
                     item is MvSpecFunction
                             && item.isNative
@@ -145,7 +145,7 @@ class HighlightingAnnotator: MvAnnotatorBase() {
             is MvStructLitExpr -> MvColor.STRUCT
             is MvStructPat -> MvColor.STRUCT
             is MvRefExpr -> {
-                val item = path.reference?.resolve() ?: return null
+                val item = path.reference?.resolveFollowingAliases() ?: return null
                 when {
                     item is MvConst -> MvColor.CONSTANT
                     else -> {
diff --git a/src/main/kotlin/org/move/ide/annotator/MvErrorAnnotator.kt b/src/main/kotlin/org/move/ide/annotator/MvErrorAnnotator.kt
index 769940a48..6eaedfbee 100644
--- a/src/main/kotlin/org/move/ide/annotator/MvErrorAnnotator.kt
+++ b/src/main/kotlin/org/move/ide/annotator/MvErrorAnnotator.kt
@@ -193,13 +193,13 @@ class MvErrorAnnotator: MvAnnotatorBase() {
     }
 
     private fun checkMethodOrPath(methodOrPath: MvMethodOrPath, holder: MvAnnotationHolder) {
-        val item = methodOrPath.reference?.resolveWithAliases()
+        val item = methodOrPath.reference?.resolveFollowingAliases()
         val msl = methodOrPath.isMslScope
         val realCount = methodOrPath.typeArguments.size
 
         val parent = methodOrPath.parent
         if (item == null && methodOrPath is MvPath
-            && methodOrPath.nullModuleRef && methodOrPath.identifierName == "vector"
+            && methodOrPath.qualifier == null && methodOrPath.identifierName == "vector"
         ) {
             val expectedCount = 1
             if (realCount != expectedCount) {
@@ -302,7 +302,7 @@ class MvErrorAnnotator: MvAnnotatorBase() {
 
         val itemLabel = qualName.editorText()
         val realCount = typeArgumentList.typeArgumentList.size
-        assert(realCount != 0) { "Should be non-zero if typeArgumentList exists" }
+        check(realCount != 0) { "Should be non-zero if typeArgumentList exists" }
 
         // if any type param is passed, inference is disabled, so check fully
         when {
diff --git a/src/main/kotlin/org/move/ide/formatter/MoveFmtBlock.kt b/src/main/kotlin/org/move/ide/formatter/MoveFmtBlock.kt
index 928bf241a..5754f80dc 100644
--- a/src/main/kotlin/org/move/ide/formatter/MoveFmtBlock.kt
+++ b/src/main/kotlin/org/move/ide/formatter/MoveFmtBlock.kt
@@ -56,7 +56,7 @@ class MoveFmtBlock(
                     parentType == FUNCTION_PARAMETER_LIST -> chopListWrap
                     parentType == VALUE_ARGUMENT_LIST -> chopListWrap
                     parentType == ATTR_ITEM_LIST -> chopListWrap
-                    parentType == USE_ITEM_GROUP -> chopListWrap
+                    parentType == USE_GROUP -> chopListWrap
                     else -> null
                 }
 
diff --git a/src/main/kotlin/org/move/ide/formatter/impl/utils.kt b/src/main/kotlin/org/move/ide/formatter/impl/utils.kt
index 6f62e2283..f31ecc6a2 100644
--- a/src/main/kotlin/org/move/ide/formatter/impl/utils.kt
+++ b/src/main/kotlin/org/move/ide/formatter/impl/utils.kt
@@ -38,7 +38,7 @@ val BLOCK_LIKE = orSet(STRUCT_LITERAL_BLOCKS, DEF_BLOCKS)
 val DELIMITED_BLOCKS = orSet(
     PAREN_DELIMITED_BLOCKS, ANGLE_DELIMITED_BLOCKS, BRACKET_DELIMITED_BLOCKS,
     BLOCK_LIKE,
-    ts(USE_ITEM_GROUP)
+    ts(USE_GROUP)
 )
 
 fun ASTNode?.isWhitespaceOrEmpty() = this == null || textLength == 0 || elementType == TokenType.WHITE_SPACE
@@ -72,7 +72,7 @@ fun ASTNode.isDelimiterOfCurrentBlock(parent: ASTNode?): Boolean {
     if (parent == null) return false
     val parentType = parent.elementType
     return when (elementType) {
-        L_BRACE, R_BRACE -> parentType in BLOCK_LIKE || parentType == USE_ITEM_GROUP
+        L_BRACE, R_BRACE -> parentType in BLOCK_LIKE || parentType == USE_GROUP
         L_BRACK, R_BRACK -> parentType in BRACKET_DELIMITED_BLOCKS
         L_PAREN, R_PAREN -> parentType in PAREN_DELIMITED_BLOCKS
         LT, GT -> parentType in ANGLE_DELIMITED_BLOCKS
diff --git a/src/main/kotlin/org/move/ide/hints/TypeParameterInfoHandler.kt b/src/main/kotlin/org/move/ide/hints/TypeParameterInfoHandler.kt
index ef4a0eb34..d5b42e2a6 100644
--- a/src/main/kotlin/org/move/ide/hints/TypeParameterInfoHandler.kt
+++ b/src/main/kotlin/org/move/ide/hints/TypeParameterInfoHandler.kt
@@ -19,7 +19,7 @@ class TypeParameterInfoHandler :
 
     override fun calculateParameterInfo(element: MvTypeArgumentList): Array<TypeParamsDescription>? {
         val parentPath = element.parent as? MvPath ?: return null
-        val owner = parentPath.reference?.resolveWithAliases() ?: return null
+        val owner = parentPath.reference?.resolveFollowingAliases() ?: return null
         // if zero type parameters
         if (owner !is MvTypeParametersOwner) return null
 
diff --git a/src/main/kotlin/org/move/ide/inspections/AddressByValueImportInspection.kt b/src/main/kotlin/org/move/ide/inspections/AddressByValueImportInspection.kt
deleted file mode 100644
index 33bf76429..000000000
--- a/src/main/kotlin/org/move/ide/inspections/AddressByValueImportInspection.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.move.ide.inspections
-
-import com.intellij.codeInspection.ProblemHighlightType
-import com.intellij.codeInspection.ProblemsHolder
-import org.move.cli.Consts
-import org.move.ide.inspections.fixes.ChangeAddressNameFix
-import org.move.lang.core.psi.MvModule
-import org.move.lang.core.psi.MvModuleUseSpeck
-import org.move.lang.core.psi.MvVisitor
-import org.move.lang.core.types.Address
-import org.move.lang.core.types.address
-import org.move.lang.moveProject
-
-class AddressByValueImportInspection : MvLocalInspectionTool() {
-    override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): MvVisitor =
-        object : MvVisitor() {
-            override fun visitModuleUseSpeck(o: MvModuleUseSpeck) {
-                val moduleRef = o.fqModuleRef ?: return
-                // no error if unresolved by value (default)
-                val module = moduleRef.reference?.resolve() as? MvModule ?: return
-
-                val moveProj = moduleRef.moveProject ?: return
-
-                val refAddress = moduleRef.addressRef.address(moveProj) ?: return
-                if (refAddress !is Address.Named) return
-                if (refAddress.addressLit(moveProj)?.canonical() == Consts.ADDR_PLACEHOLDER) return
-
-                val modAddress = module.address(moveProj) ?: return
-                if (modAddress !is Address.Named) return
-                if (modAddress.addressLit(moveProj)?.canonical() == Consts.ADDR_PLACEHOLDER) return
-
-                if (!Address.eq(refAddress, modAddress)) {
-                    holder.registerProblem(
-                        moduleRef,
-                        "Module is declared with a different address `${modAddress.name}`",
-                        ProblemHighlightType.WEAK_WARNING,
-                        ChangeAddressNameFix(moduleRef, modAddress.name),
-                    )
-                }
-            }
-        }
-}
diff --git a/src/main/kotlin/org/move/ide/inspections/MvLocalInspectionTool.kt b/src/main/kotlin/org/move/ide/inspections/MvLocalInspectionTool.kt
index c7931c6d2..fe33911db 100644
--- a/src/main/kotlin/org/move/ide/inspections/MvLocalInspectionTool.kt
+++ b/src/main/kotlin/org/move/ide/inspections/MvLocalInspectionTool.kt
@@ -2,9 +2,6 @@ package org.move.ide.inspections
 
 import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo
 import com.intellij.codeInspection.*
-import com.intellij.model.SideEffectGuard
-import com.intellij.model.SideEffectGuard.EffectType.EXEC
-import com.intellij.model.SideEffectGuard.EffectType.SETTINGS
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
diff --git a/src/main/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspection.kt b/src/main/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspection.kt
index 358fc92cf..13e576680 100644
--- a/src/main/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspection.kt
+++ b/src/main/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspection.kt
@@ -2,38 +2,36 @@ package org.move.ide.inspections
 
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.psi.util.descendantsOfType
 import org.move.cli.settings.isDebugModeEnabled
 import org.move.ide.inspections.imports.AutoImportFix
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
-import org.move.lang.core.resolve.ref.MvReferenceElement
 import org.move.lang.core.types.infer.inference
 import org.move.lang.core.types.ty.TyUnknown
 
-class MvUnresolvedReferenceInspection : MvLocalInspectionTool() {
+class MvUnresolvedReferenceInspection: MvLocalInspectionTool() {
 
     var ignoreWithoutQuickFix: Boolean = false
 
     override val isSyntaxOnly get() = false
 
-    private fun ProblemsHolder.registerUnresolvedReferenceError(element: MvReferenceElement) {
+    private fun ProblemsHolder.registerUnresolvedReferenceError(path: MvPath) {
         // no errors in pragmas
-        if (element.hasAncestor<MvPragmaSpecStmt>()) return
+        if (path.hasAncestor<MvPragmaSpecStmt>()) return
 
-        val candidates = AutoImportFix.findApplicableContext(element)?.candidates.orEmpty()
+        val candidates = AutoImportFix.findApplicableContext(path)?.candidates.orEmpty()
         if (candidates.isEmpty() && ignoreWithoutQuickFix) return
 
-        val referenceName = element.referenceName ?: return
-        val parent = element.parent
+        val referenceName = path.referenceName ?: return
+        val parent = path.parent
         val description = when (parent) {
             is MvPathType -> "Unresolved type: `$referenceName`"
             is MvCallExpr -> "Unresolved function: `$referenceName`"
             else -> "Unresolved reference: `$referenceName`"
         }
 
-        val highlightedElement = element.referenceNameElement ?: element
-        val fix = if (candidates.isNotEmpty()) AutoImportFix(element) else null
+        val highlightedElement = path.referenceNameElement ?: path
+        val fix = if (candidates.isNotEmpty()) AutoImportFix(path) else null
         registerProblem(
             highlightedElement,
             description,
@@ -42,22 +40,22 @@ class MvUnresolvedReferenceInspection : MvLocalInspectionTool() {
         )
     }
 
-    override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = object : MvVisitor() {
-        override fun visitModuleRef(moduleRef: MvModuleRef) {
-            if (moduleRef.isMslScope && !isDebugModeEnabled()) {
-                return
-            }
-            // skip this check, as it will be checked in MvPath visitor
-            if (moduleRef.ancestorStrict<MvPath>() != null) return
-
-            // skip those two, checked in UseSpeck checks later
-            if (moduleRef.ancestorStrict<MvUseStmt>() != null) return
-            if (moduleRef is MvFQModuleRef) return
-
-            if (moduleRef.unresolved) {
-                holder.registerUnresolvedReferenceError(moduleRef)
-            }
-        }
+    override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = object: MvVisitor() {
+//        override fun visitModuleRef(moduleRef: MvModuleRef) {
+//            if (moduleRef.isMslScope && !isDebugModeEnabled()) {
+//                return
+//            }
+//            // skip this check, as it will be checked in MvPath visitor
+//            if (moduleRef.ancestorStrict<MvPath>() != null) return
+//
+//            // skip those two, checked in UseSpeck checks later
+//            if (moduleRef.ancestorStrict<MvUseStmt>() != null) return
+//            if (moduleRef is MvFQModuleRef) return
+//
+//            if (moduleRef.unresolved) {
+//                holder.registerUnresolvedReferenceError(moduleRef)
+//            }
+//        }
 
         override fun visitPath(path: MvPath) {
             // skip specs in non-dev mode, too many false-positives
@@ -73,17 +71,30 @@ class MvUnresolvedReferenceInspection : MvLocalInspectionTool() {
             if (path.textMatches("_") && path.isInsideAssignmentLhs()) return
             // assert macro
             if (path.text == "assert") return
+
             // attribute values are special case
             if (path.hasAncestor<MvAttrItem>()) return
 
-            val moduleRef = path.moduleRef
-            if (moduleRef != null) {
-                if (moduleRef is MvFQModuleRef) return
-                if (moduleRef.unresolved) {
-                    holder.registerUnresolvedReferenceError(moduleRef)
+            val qualifier = path.qualifier
+            if (qualifier != null
+                // AddressPath, should be checked here
+                && qualifier.pathAddress == null
+            ) {
+                if (qualifier.reference?.resolve() == null) {
                     return
                 }
             }
+//            val qualifier = path.qualifier
+//            if (qualifier)
+
+//            val moduleRef = path.moduleRef
+//            if (moduleRef != null) {
+//                if (moduleRef is MvFQModuleRef) return
+//                if (moduleRef.unresolved) {
+//                    holder.registerUnresolvedReferenceError(moduleRef)
+//                    return
+//                }
+//            }
             if (path.unresolved) {
                 holder.registerUnresolvedReferenceError(path)
             }
@@ -184,40 +195,40 @@ class MvUnresolvedReferenceInspection : MvLocalInspectionTool() {
             }
         }
 
-        override fun visitModuleUseSpeck(o: MvModuleUseSpeck) {
-            val moduleRef = o.fqModuleRef ?: return
-            if (!moduleRef.resolvable) {
-                val refNameElement = moduleRef.referenceNameElement ?: return
-                holder.registerProblem(
-                    refNameElement,
-                    "Unresolved reference: `${refNameElement.text}`",
-                    ProblemHighlightType.LIKE_UNKNOWN_SYMBOL
-                )
-            }
-        }
-
-        override fun visitItemUseSpeck(o: MvItemUseSpeck) {
-            val moduleRef = o.fqModuleRef
-            if (!moduleRef.resolvable) {
-                val refNameElement = moduleRef.referenceNameElement ?: return
-                holder.registerProblem(
-                    refNameElement,
-                    "Unresolved reference: `${refNameElement.text}`",
-                    ProblemHighlightType.LIKE_UNKNOWN_SYMBOL
-                )
-                return
-            }
-            val useItems = o.descendantsOfType<MvUseItem>()
-            for (useItem in useItems) {
-                if (!useItem.resolvable) {
-                    val refNameElement = useItem.referenceNameElement
-                    holder.registerProblem(
-                        refNameElement,
-                        "Unresolved reference: `${refNameElement.text}`",
-                        ProblemHighlightType.LIKE_UNKNOWN_SYMBOL
-                    )
-                }
-            }
-        }
+//        override fun visitModuleUseSpeck(o: MvModuleUseSpeck) {
+//            val moduleRef = o.fqModuleRef ?: return
+//            if (!moduleRef.resolvable) {
+//                val refNameElement = moduleRef.referenceNameElement ?: return
+//                holder.registerProblem(
+//                    refNameElement,
+//                    "Unresolved reference: `${refNameElement.text}`",
+//                    ProblemHighlightType.LIKE_UNKNOWN_SYMBOL
+//                )
+//            }
+//        }
+
+//        override fun visitItemUseSpeck(o: MvItemUseSpeck) {
+//            val moduleRef = o.fqModuleRef
+//            if (!moduleRef.resolvable) {
+//                val refNameElement = moduleRef.referenceNameElement ?: return
+//                holder.registerProblem(
+//                    refNameElement,
+//                    "Unresolved reference: `${refNameElement.text}`",
+//                    ProblemHighlightType.LIKE_UNKNOWN_SYMBOL
+//                )
+//                return
+//            }
+//            val useItems = o.descendantsOfType<MvUseItem>()
+//            for (useItem in useItems) {
+//                if (!useItem.resolvable) {
+//                    val refNameElement = useItem.referenceNameElement
+//                    holder.registerProblem(
+//                        refNameElement,
+//                        "Unresolved reference: `${refNameElement.text}`",
+//                        ProblemHighlightType.LIKE_UNKNOWN_SYMBOL
+//                    )
+//                }
+//            }
+//        }
     }
 }
diff --git a/src/main/kotlin/org/move/ide/inspections/MvUnusedImportInspection.kt b/src/main/kotlin/org/move/ide/inspections/MvUnusedImportInspection.kt
index 8248ca887..fa8d1da7f 100644
--- a/src/main/kotlin/org/move/ide/inspections/MvUnusedImportInspection.kt
+++ b/src/main/kotlin/org/move/ide/inspections/MvUnusedImportInspection.kt
@@ -4,11 +4,12 @@ import com.intellij.codeInsight.daemon.HighlightDisplayKey
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.openapi.project.Project
 import com.intellij.profile.codeInspection.InspectionProjectProfileManager
-import org.move.ide.inspections.imports.ImportAnalyzer
+import org.move.ide.inspections.imports.ImportAnalyzer2
 
-class MvUnusedImportInspection : MvLocalInspectionTool() {
+class MvUnusedImportInspection: MvLocalInspectionTool() {
 
-    override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = ImportAnalyzer(holder)
+    override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = ImportAnalyzer2(holder)
+//    override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = ImportAnalyzer(holder)
 
     @Suppress("CompanionObjectInExtension")
     companion object {
diff --git a/src/main/kotlin/org/move/ide/inspections/PhantomTypeParameterInspection.kt b/src/main/kotlin/org/move/ide/inspections/PhantomTypeParameterInspection.kt
index 67fb91632..6fa282567 100644
--- a/src/main/kotlin/org/move/ide/inspections/PhantomTypeParameterInspection.kt
+++ b/src/main/kotlin/org/move/ide/inspections/PhantomTypeParameterInspection.kt
@@ -31,7 +31,7 @@ class PhantomTypeParameterInspection : MvLocalInspectionTool() {
                         // stop if empty
                         if (path.typeArguments.isEmpty()) continue
                         // determine phantom status of every argument, drop if phantom
-                        val outerStruct = path.reference?.resolveWithAliases() as? MvStruct ?: continue
+                        val outerStruct = path.reference?.resolveFollowingAliases() as? MvStruct ?: continue
                         for ((i, typeArg) in path.typeArguments.withIndex()) {
                             val outerTypeParam = outerStruct.typeParameters.getOrNull(i) ?: continue
                             if (outerTypeParam.isPhantom) {
diff --git a/src/main/kotlin/org/move/ide/inspections/RedundantQualifiedPathInspection.kt b/src/main/kotlin/org/move/ide/inspections/RedundantQualifiedPathInspection.kt
deleted file mode 100644
index d923a8e1c..000000000
--- a/src/main/kotlin/org/move/ide/inspections/RedundantQualifiedPathInspection.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.move.ide.inspections
-
-import com.intellij.codeInspection.LocalQuickFix
-import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.codeInspection.ProblemHighlightType
-import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.TextRange
-import org.move.lang.core.psi.*
-
-class RedundantQualifiedPathInspection : MvLocalInspectionTool() {
-
-    override val isSyntaxOnly: Boolean get() = true
-
-    override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): MvVisitor =
-        object : MvVisitor() {
-            override fun visitPath(path: MvPath) {
-                val pathText = path.text
-                    .replace(path.typeArgumentList?.text.orEmpty(), "")
-                    .replace(Regex("\\s"), "")
-                val item = path.reference?.resolveWithAliases() ?: return
-
-                val importsOwner = path.containingScript?.scriptBlock
-                    ?: path.containingModule?.moduleBlock
-                    ?: return
-                val shortestPathText = importsOwner.shortestPathText(item) ?: return
-                // if aliases are involved, could lead to bugs
-                if (!pathText.endsWith(shortestPathText)) return
-
-                val diff = pathText.length - shortestPathText.length
-                if (diff > 0) {
-                    if (pathText.substring(0, diff) == "Self::") return
-                    val range = TextRange.from(0, diff)
-                    holder.registerProblem(
-                        path,
-                        "Redundant qualifier",
-                        ProblemHighlightType.LIKE_UNUSED_SYMBOL,
-                        range,
-                        object : LocalQuickFix {
-                            override fun getFamilyName(): String = "Remove redundant qualifier"
-
-                            override fun applyFix(
-                                project: Project,
-                                descriptor: ProblemDescriptor
-                            ) {
-                                val newPath = project.psiFactory.path(shortestPathText)
-                                descriptor.psiElement.replace(newPath)
-                            }
-
-                        })
-                }
-            }
-        }
-}
diff --git a/src/main/kotlin/org/move/ide/inspections/ReplaceWithMethodCallInspection.kt b/src/main/kotlin/org/move/ide/inspections/ReplaceWithMethodCallInspection.kt
index 02a500a5f..714c96e7d 100644
--- a/src/main/kotlin/org/move/ide/inspections/ReplaceWithMethodCallInspection.kt
+++ b/src/main/kotlin/org/move/ide/inspections/ReplaceWithMethodCallInspection.kt
@@ -18,7 +18,7 @@ class ReplaceWithMethodCallInspection: MvLocalInspectionTool() {
     override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): MvVisitor {
         return object: MvVisitor() {
             override fun visitCallExpr(callExpr: MvCallExpr) {
-                val function = callExpr.path.reference?.resolveWithAliases() as? MvFunction ?: return
+                val function = callExpr.path.reference?.resolveFollowingAliases() as? MvFunction ?: return
                 val msl = callExpr.isMsl()
                 val inference = callExpr.inference(msl) ?: return
 
diff --git a/src/main/kotlin/org/move/ide/inspections/compilerV2/ReplaceWithIndexExprInspection.kt b/src/main/kotlin/org/move/ide/inspections/compilerV2/ReplaceWithIndexExprInspection.kt
index 20127d940..887f66f83 100644
--- a/src/main/kotlin/org/move/ide/inspections/compilerV2/ReplaceWithIndexExprInspection.kt
+++ b/src/main/kotlin/org/move/ide/inspections/compilerV2/ReplaceWithIndexExprInspection.kt
@@ -16,7 +16,7 @@ class ReplaceWithIndexExprInspection: MvLocalInspectionTool() {
     override fun buildMvVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): MvVisitor {
         return object: MvVisitor() {
             override fun visitCallExpr(callExpr: MvCallExpr) {
-                val function = callExpr.path.reference?.resolveWithAliases() as? MvFunction ?: return
+                val function = callExpr.path.reference?.resolveFollowingAliases() as? MvFunction ?: return
                 val module = function.module ?: return
                 val moveProject = function.moveProject ?: return
                 val msl = callExpr.isMsl()
diff --git a/src/main/kotlin/org/move/ide/inspections/fixes/ChangeAddressNameFix.kt b/src/main/kotlin/org/move/ide/inspections/fixes/ChangeAddressNameFix.kt
deleted file mode 100644
index 3a9f70732..000000000
--- a/src/main/kotlin/org/move/ide/inspections/fixes/ChangeAddressNameFix.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.move.ide.inspections.fixes
-
-import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiFile
-import org.move.ide.inspections.DiagnosticFix
-import org.move.lang.core.psi.MvFQModuleRef
-import org.move.lang.core.psi.MvModule
-import org.move.lang.core.psi.psiFactory
-import org.move.lang.core.types.address
-import org.move.lang.moveProject
-
-class ChangeAddressNameFix(
-    moduleRef: MvFQModuleRef,
-    val newAddressRefName: String
-) : DiagnosticFix<MvFQModuleRef>(moduleRef) {
-
-    override fun getText(): String = "Change address to `$newAddressRefName`"
-    override fun getFamilyName(): String = "Change address ref"
-
-    override fun stillApplicable(project: Project, file: PsiFile, element: MvFQModuleRef): Boolean {
-        return element.addressRef.namedAddress?.referenceName != newAddressRefName
-    }
-
-    override fun invoke(project: Project, file: PsiFile, element: MvFQModuleRef) {
-        val ref = element
-
-        // resolve by value
-        val mod = ref.reference?.resolve() as? MvModule ?: return
-        val proj = mod.moveProject ?: return
-
-        val modAddressRef = mod.addressRef ?: return
-        if (ref.addressRef.address(proj) != mod.address(proj)) {
-            val newAddressRef = project.psiFactory.addressRef(modAddressRef.text)
-            ref.addressRef.replace(newAddressRef)
-        }
-    }
-}
diff --git a/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt b/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt
index 0ef032ced..3fbbda648 100644
--- a/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt
+++ b/src/main/kotlin/org/move/ide/inspections/imports/AutoImportFix.kt
@@ -9,20 +9,19 @@ import org.move.ide.inspections.DiagnosticFix
 import org.move.ide.utils.imports.ImportCandidate
 import org.move.ide.utils.imports.ImportCandidateCollector
 import org.move.ide.utils.imports.import
-import org.move.lang.core.psi.*
+import org.move.lang.core.psi.MvElement
+import org.move.lang.core.psi.MvPath
+import org.move.lang.core.psi.MvUseSpeck
+import org.move.lang.core.psi.MvUseStmt
 import org.move.lang.core.psi.ext.ancestorStrict
-import org.move.lang.core.psi.ext.asSmartPointer
 import org.move.lang.core.psi.ext.hasAncestor
 import org.move.lang.core.psi.ext.importCandidateNamespaces
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.letStmtScope
-import org.move.lang.core.resolve.ref.MvReferenceElement
+import org.move.lang.core.psi.ext.qualifier
 import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
 import org.move.openapiext.runWriteCommandAction
 
-class AutoImportFix(element: MvReferenceElement): DiagnosticFix<MvReferenceElement>(element),
-                                                  HighPriorityAction {
+class AutoImportFix(element: MvPath): DiagnosticFix<MvPath>(element),
+                                      HighPriorityAction {
 
     private var isConsumed: Boolean = false
 
@@ -32,11 +31,11 @@ class AutoImportFix(element: MvReferenceElement): DiagnosticFix<MvReferenceEleme
     override fun stillApplicable(
         project: Project,
         file: PsiFile,
-        element: MvReferenceElement
+        element: MvPath
     ): Boolean =
         !isConsumed
 
-    override fun invoke(project: Project, file: PsiFile, element: MvReferenceElement) {
+    override fun invoke(project: Project, file: PsiFile, element: MvPath) {
         if (element.reference == null) return
         if (element.hasAncestor<MvUseStmt>()) return
 
@@ -75,16 +74,16 @@ class AutoImportFix(element: MvReferenceElement): DiagnosticFix<MvReferenceEleme
     companion object {
         const val NAME = "Import"
 
-        fun findApplicableContext(refElement: MvReferenceElement): Context? {
-            if (refElement.reference == null) return null
-            if (refElement.resolvable) return null
-            if (refElement.ancestorStrict<MvUseStmt>() != null) return null
-            if (refElement is MvPath && refElement.moduleRef != null) return null
+        fun findApplicableContext(path: MvPath): Context? {
+            if (path.reference == null) return null
+            if (path.resolvable) return null
+            if (path.ancestorStrict<MvUseSpeck>() != null) return null
+            if (path.qualifier != null) return null
 
             // TODO: no auto-import if name in scope, but cannot be resolved
 
-            val refName = refElement.referenceName ?: return null
-            val importContext = ImportContext.from(refElement)
+            val refName = path.referenceName ?: return null
+            val importContext = ImportContext.from(path)
             val candidates =
                 ImportCandidateCollector.getImportCandidates(importContext, refName)
             return Context(candidates)
@@ -94,38 +93,41 @@ class AutoImportFix(element: MvReferenceElement): DiagnosticFix<MvReferenceEleme
 
 @Suppress("DataClassPrivateConstructor")
 data class ImportContext private constructor(
-    val pathElement: MvReferenceElement,
-    val namespaces: Set<Namespace>,
-    val visibilities: Set<Visibility>,
-    val contextScopeInfo: ContextScopeInfo,
+    val pathElement: MvPath,
+    val ns: Set<Namespace>,
+//    val visibilities: Set<Visibility>,
+//    val contextScopeInfo: ContextScopeInfo,
 ) {
     companion object {
         fun from(
-            contextElement: MvReferenceElement,
-            namespaces: Set<Namespace>,
-            visibilities: Set<Visibility>,
-            contextScopeInfo: ContextScopeInfo
+            pathElement: MvPath,
+            ns: Set<Namespace>,
+//            visibilities: Set<Visibility>,
+//            contextScopeInfo: ContextScopeInfo
         ): ImportContext {
-            return ImportContext(contextElement, namespaces, visibilities, contextScopeInfo)
+            return ImportContext(pathElement, ns)
+//            return ImportContext(pathElement, ns, visibilities, contextScopeInfo)
         }
 
-        fun from(refElement: MvReferenceElement): ImportContext {
-            val ns = refElement.importCandidateNamespaces()
-            val vs = if (refElement.containingScript != null) {
-                setOf(Visibility.Public, Visibility.PublicScript)
-            } else {
-                val module = refElement.containingModule
-                if (module != null) {
-                    setOf(Visibility.Public, Visibility.PublicFriend(module.asSmartPointer()))
-                } else {
-                    setOf(Visibility.Public)
-                }
-            }
-            val contextScopeInfo = ContextScopeInfo(
-                letStmtScope = refElement.letStmtScope,
-                refItemScopes = refElement.refItemScopes,
-            )
-            return ImportContext(refElement, ns, vs, contextScopeInfo)
+        fun from(path: MvPath): ImportContext {
+            val ns = path.importCandidateNamespaces()
+//            val vs =
+//                if (path.containingScript != null) {
+//                    setOf(Visibility.Public, Visibility.PublicScript)
+//                } else {
+//                    val module = path.containingModule
+//                    if (module != null) {
+//                        setOf(Visibility.Public, Visibility.PublicFriend(module.asSmartPointer()))
+//                    } else {
+//                        setOf(Visibility.Public)
+//                    }
+//                }
+//            val contextScopeInfo = ContextScopeInfo(
+//                letStmtScope = path.letStmtScope,
+//                refItemScopes = path.refItemScopes,
+//            )
+            return ImportContext(path, ns)
+//            return ImportContext(path, ns, vs, contextScopeInfo)
         }
     }
 }
diff --git a/src/main/kotlin/org/move/ide/inspections/imports/BasePathType.kt b/src/main/kotlin/org/move/ide/inspections/imports/BasePathType.kt
new file mode 100644
index 000000000..2f2d2df16
--- /dev/null
+++ b/src/main/kotlin/org/move/ide/inspections/imports/BasePathType.kt
@@ -0,0 +1,75 @@
+package org.move.ide.inspections.imports
+
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.ext.*
+
+// classifies foo of `foo::bar::baz`
+sealed class BasePathType {
+    data object Address: BasePathType()
+    data class Module(val moduleName: String): BasePathType()
+    data class Item(val itemName: String): BasePathType()
+}
+
+fun MvPath.basePathType(): BasePathType? {
+    val rootPath = this.rootPath()
+    val qualifier = rootPath.qualifier
+    // foo
+    if (qualifier == null) {
+        return rootPath.referenceName?.let { BasePathType.Item(it) }
+    }
+
+    // 0x1::m
+    if (qualifier.pathAddress != null) return BasePathType.Address
+
+    val qualifierBase = qualifier.qualifier
+    // aptos_framework::m::foo
+    if (qualifierBase != null) {
+        return BasePathType.Address
+    }
+
+    // todo: `aptos_framework::m`,
+    //  first resolve aptos_framework into the NamedAddress, then return the BasePathType.Address
+
+    // m::foo
+    return qualifier.referenceName?.let { BasePathType.Module(it) }
+}
+
+// only Main/Test for now
+val MvElement.usageScope: NamedItemScope
+    get() {
+        var parentElement = this.parent
+        while (parentElement != null) {
+//        if (parentElement is MslOnlyElement) return ItemScope.MAIN
+            if (parentElement is MvDocAndAttributeOwner && parentElement.hasTestOnlyAttr) {
+                return NamedItemScope.TEST
+            }
+            if (parentElement is MvDocAndAttributeOwner && parentElement.hasVerifyOnlyAttr) {
+                return NamedItemScope.VERIFY
+            }
+            if (parentElement is MvFunction && parentElement.hasTestAttr) {
+                return NamedItemScope.TEST
+            }
+            parentElement = parentElement.parent
+        }
+        return NamedItemScope.MAIN
+    }
+
+// only Main/Test for now
+val MvUseStmt.declaredItemScope: NamedItemScope
+    get() {
+        if (this.hasTestOnlyAttr) {
+            return NamedItemScope.TEST
+        }
+        var parentElement = this.parent
+        while (parentElement != null) {
+//        if (parentElement is MslOnlyElement) return ItemScope.MAIN
+            if (parentElement is MvDocAndAttributeOwner && parentElement.hasTestOnlyAttr) {
+                return NamedItemScope.TEST
+            }
+            if (parentElement is MvFunction && parentElement.hasTestAttr) {
+                return NamedItemScope.TEST
+            }
+            parentElement = parentElement.parent
+        }
+        return NamedItemScope.MAIN
+    }
diff --git a/src/main/kotlin/org/move/ide/inspections/imports/ImportAnalyzer.kt b/src/main/kotlin/org/move/ide/inspections/imports/ImportAnalyzer.kt
index e9ae838a0..d1d44de70 100644
--- a/src/main/kotlin/org/move/ide/inspections/imports/ImportAnalyzer.kt
+++ b/src/main/kotlin/org/move/ide/inspections/imports/ImportAnalyzer.kt
@@ -2,103 +2,77 @@ package org.move.ide.inspections.imports
 
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
-import org.move.ide.inspections.imports.PathStart.Companion.pathStart
+import org.move.ide.inspections.imports.UseItemType.*
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
 import org.move.stdext.chain
 
-private val MvImportsOwner.useSpecks: List<UseSpeck>
-    get() {
-        val specks = mutableListOf<UseSpeck>()
-        for (stmt in this.useStmtList) {
-            specks.addAll(stmt.useSpecks)
-        }
-        return specks
-    }
-
-private val MvImportsOwner.importOwnerWithSiblings: List<MvImportsOwner>
-    get() {
-        return when (this) {
-            is MvModuleBlock -> {
-                // add all module spec blocks
-                listOf(this).chain(this.module.allModuleSpecBlocks()).toList()
-            }
-            is MvModuleSpecBlock -> {
-                // add module block
-                val moduleBlock = this.moduleSpec.moduleItem?.moduleBlock
-                if (moduleBlock != null) {
-                    listOf(moduleBlock, this)
-                } else {
-                    listOf(this)
-                }
-            }
-            else -> listOf(this)
-        }
-    }
-
-class ImportAnalyzer(val holder: ProblemsHolder): MvVisitor() {
+class ImportAnalyzer2(val holder: ProblemsHolder): MvVisitor() {
 
     override fun visitModuleBlock(o: MvModuleBlock) = analyzeImportsOwner(o)
-
     override fun visitScriptBlock(o: MvScriptBlock) = analyzeImportsOwner(o)
-
     override fun visitModuleSpecBlock(o: MvModuleSpecBlock) = analyzeImportsOwner(o)
 
-    fun analyzeImportsOwner(importsOwner: MvImportsOwner) {
+    fun analyzeImportsOwner(importsOwner: MvItemsOwner) {
         analyzeUseStmtsForScope(importsOwner, NamedItemScope.TEST)
         analyzeUseStmtsForScope(importsOwner, NamedItemScope.MAIN)
     }
 
-    private fun analyzeUseStmtsForScope(rootImportOwner: MvImportsOwner, itemScope: NamedItemScope) {
-        val allSpecksHit = mutableSetOf<UseSpeck>()
-        val rootImportOwnerWithSiblings = rootImportOwner.importOwnerWithSiblings
-        val reachablePaths =
-            rootImportOwnerWithSiblings
-                .flatMap { it.descendantsOfType<MvPath>() }
-                .mapNotNull { path -> path.pathStart?.let { Pair(path, it) } }
-                .filter { it.second.usageScope == itemScope }
-        for ((path, start) in reachablePaths) {
-            for (importOwner in path.ancestorsOfType<MvImportsOwner>()) {
-                val useSpecks =
-                    importOwner.importOwnerWithSiblings
-                        .flatMap { it.useSpecks }
-                        .filter { it.scope == itemScope }
-                val speckHit =
-                    when (start) {
-                        is PathStart.Module ->
-                            useSpecks
-                                .filter { it is UseSpeck.Module || it is UseSpeck.SelfModule }
+    private fun analyzeUseStmtsForScope(rootItemsOwner: MvItemsOwner, itemScope: NamedItemScope) {
+        val allUseItemsHit = mutableSetOf<UseItem>()
+        val rootItemOwnerWithSiblings = rootItemsOwner.itemsOwnerWithSiblings
+
+        val paths = rootItemOwnerWithSiblings
+            .flatMap { it.descendantsOfType<MvPath>() }
+            .filter { it.basePath() == it }
+            .filter { it.usageScope == itemScope }
+            .filter { !it.hasAncestor<MvUseSpeck>() }
+
+        for (path in paths) {
+            val basePathType = path.basePathType()
+            for (itemsOwner in path.ancestorsOfType<MvItemsOwner>()) {
+                val useItems =
+                    itemsOwner.itemsOwnerWithSiblings
+                        .flatMap { it.useItems }.filter { it.scope == itemScope }
+
+                val useItemHit =
+                    when (basePathType) {
+                        is BasePathType.Item -> {
+                            useItems.filter { it.type == ITEM }
                                 // only hit first encountered to remove duplicates
-                                .firstOrNull { it.nameOrAlias == start.modName }
-                        is PathStart.Item ->
-                            useSpecks.filterIsInstance<UseSpeck.Item>()
+                                .firstOrNull { it.nameOrAlias == basePathType.itemName }
+                        }
+                        is BasePathType.Module -> {
+                            useItems.filter { it.type == MODULE || it.type == SELF_MODULE }
                                 // only hit first encountered to remove duplicates
-                                .firstOrNull { it.nameOrAlias == start.itemName }
-                        // PathStart.Address is fq path, and doesn't participate in imports
+                                .firstOrNull { it.nameOrAlias == basePathType.moduleName }
+                        }
+                        // BasePathType.Address is fq path, and doesn't participate in imports
                         else -> null
                     }
-                if (speckHit != null) {
-                    allSpecksHit.add(speckHit)
+
+                if (useItemHit != null) {
+                    allUseItemsHit.add(useItemHit)
                     break
                 }
             }
         }
 
         // includes self
-        val reachableImportOwners = rootImportOwner.descendantsOfTypeOrSelf<MvImportsOwner>()
-        for (importsOwner in reachableImportOwners) {
-            val scopeUseStmts = importsOwner.useStmtList.filter { it.declaredItemScope == itemScope }
+        val reachableItemsOwners = rootItemsOwner.descendantsOfTypeOrSelf<MvItemsOwner>()
+        for (itemsOwner in reachableItemsOwners) {
+            val scopeUseStmts = itemsOwner.useStmtList.filter { it.declaredItemScope == itemScope }
             for (useStmt in scopeUseStmts) {
-                val unusedSpecks = useStmt.useSpecks.toSet() - allSpecksHit
-                holder.registerStmtSpeckError(useStmt, unusedSpecks)
+                val unusedUseItems = useStmt.useItems.toSet() - allUseItemsHit
+                holder.registerStmtSpeckError2(useStmt, unusedUseItems)
             }
         }
     }
 }
 
-private fun ProblemsHolder.registerStmtSpeckError(useStmt: MvUseStmt, specks: Set<UseSpeck>) {
-    val moduleSpecks = specks.filterIsInstance<UseSpeck.Module>()
-    if (moduleSpecks.isNotEmpty()) {
+fun ProblemsHolder.registerStmtSpeckError2(useStmt: MvUseStmt, useItems: Set<UseItem>) {
+    val moduleUseItems = useItems.filter { it.type == MODULE }
+    if (moduleUseItems.isNotEmpty()) {
         this.registerProblem(
             useStmt,
             "Unused use item",
@@ -107,8 +81,7 @@ private fun ProblemsHolder.registerStmtSpeckError(useStmt: MvUseStmt, specks: Se
         return
     }
 
-    val itemSpecks = specks
-    if (useStmt.useSpecks.size == itemSpecks.size) {
+    if (useStmt.useItems.size == useItems.size) {
         // all inner speck types are covered, highlight complete useStmt
         this.registerProblem(
             useStmt,
@@ -116,14 +89,9 @@ private fun ProblemsHolder.registerStmtSpeckError(useStmt: MvUseStmt, specks: Se
             ProblemHighlightType.LIKE_UNUSED_SYMBOL
         )
     } else {
-        for (itemUseSpeck in itemSpecks) {
-            val useItem = when (itemUseSpeck) {
-                is UseSpeck.SelfModule -> itemUseSpeck.useItem
-                is UseSpeck.Item -> itemUseSpeck.useItem
-                else -> continue
-            }
+        for (useItem in useItems) {
             this.registerProblem(
-                useItem,
+                useItem.useSpeck,
                 "Unused use item",
                 ProblemHighlightType.LIKE_UNUSED_SYMBOL
             )
@@ -131,3 +99,23 @@ private fun ProblemsHolder.registerStmtSpeckError(useStmt: MvUseStmt, specks: Se
     }
 }
 
+val MvItemsOwner.itemsOwnerWithSiblings: List<MvItemsOwner>
+    get() {
+        return when (this) {
+            is MvModuleBlock -> {
+                // add all module spec blocks
+                listOf(this).chain(this.module.allModuleSpecBlocks()).toList()
+            }
+            is MvModuleSpecBlock -> {
+                // add module block
+                val moduleBlock = this.moduleSpec.moduleItem?.moduleBlock
+                if (moduleBlock != null) {
+                    listOf(moduleBlock, this)
+                } else {
+                    listOf(this)
+                }
+            }
+            else -> listOf(this)
+        }
+    }
+
diff --git a/src/main/kotlin/org/move/ide/inspections/imports/PathStart.kt b/src/main/kotlin/org/move/ide/inspections/imports/PathStart.kt
deleted file mode 100644
index 4e2b83efc..000000000
--- a/src/main/kotlin/org/move/ide/inspections/imports/PathStart.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.move.ide.inspections.imports
-
-import org.move.lang.core.psi.*
-import org.move.lang.core.psi.ext.MvDocAndAttributeOwner
-import org.move.lang.core.psi.ext.hasTestAttr
-import org.move.lang.core.psi.ext.hasTestOnlyAttr
-
-// only Main/Test for now
-val MvPath.pathUsageScope: NamedItemScope
-    get() {
-        var parentElement = this.parent
-        while (parentElement != null) {
-//        if (parentElement is MslOnlyElement) return ItemScope.MAIN
-            if (parentElement is MvDocAndAttributeOwner && parentElement.hasTestOnlyAttr) {
-                return NamedItemScope.TEST
-            }
-            if (parentElement is MvFunction && parentElement.hasTestAttr) {
-                return NamedItemScope.TEST
-            }
-            parentElement = parentElement.parent
-        }
-        return NamedItemScope.MAIN
-    }
-
-// only Main/Test for now
-val MvUseStmt.declaredItemScope: NamedItemScope
-    get() {
-        if (this.hasTestOnlyAttr) {
-            return NamedItemScope.TEST
-        }
-        var parentElement = this.parent
-        while (parentElement != null) {
-//        if (parentElement is MslOnlyElement) return ItemScope.MAIN
-            if (parentElement is MvDocAndAttributeOwner && parentElement.hasTestOnlyAttr) {
-                return NamedItemScope.TEST
-            }
-            if (parentElement is MvFunction && parentElement.hasTestAttr) {
-                return NamedItemScope.TEST
-            }
-            parentElement = parentElement.parent
-        }
-        return NamedItemScope.MAIN
-    }
-
-sealed class PathStart(open val usageScope: NamedItemScope) {
-    data class Address(
-        val addressRef: MvAddressRef,
-        override val usageScope: NamedItemScope
-    ): PathStart(usageScope)
-
-    data class Module(
-        val modName: String,
-        val moduleRef: MvModuleRef,
-        override val usageScope: NamedItemScope
-    ): PathStart(usageScope)
-
-    data class Item(
-        val itemName: String,
-        override val usageScope: NamedItemScope
-    ): PathStart(usageScope)
-
-    companion object {
-        val MvPath.pathStart: PathStart?
-            get() {
-                val usageScope = this.pathUsageScope
-                val pathModuleRef = this.moduleRef
-                if (pathModuleRef != null) {
-                    if (pathModuleRef is MvFQModuleRef) {
-                        return Address(pathModuleRef.addressRef, usageScope)
-                    } else {
-                        val modName = pathModuleRef.referenceName ?: return null
-                        return Module(modName, pathModuleRef, usageScope)
-                    }
-                } else {
-                    val itemName = this.referenceName ?: return null
-                    return Item(itemName, usageScope)
-                }
-            }
-    }
-}
-
diff --git a/src/main/kotlin/org/move/ide/inspections/imports/UseItem.kt b/src/main/kotlin/org/move/ide/inspections/imports/UseItem.kt
new file mode 100644
index 000000000..4305a93af
--- /dev/null
+++ b/src/main/kotlin/org/move/ide/inspections/imports/UseItem.kt
@@ -0,0 +1,57 @@
+package org.move.ide.inspections.imports
+
+import org.move.cli.settings.debugError
+import org.move.ide.inspections.imports.UseItemType.*
+import org.move.lang.core.psi.MvUseSpeck
+import org.move.lang.core.psi.MvUseStmt
+import org.move.lang.core.psi.NamedItemScope
+import org.move.lang.core.psi.ext.MvItemsOwner
+import org.move.lang.core.resolve2.PathKind
+import org.move.lang.core.resolve2.pathKind
+import org.move.lang.core.resolve2.util.forEachLeafSpeck
+
+enum class UseItemType {
+    MODULE, SELF_MODULE, ITEM;
+}
+
+data class UseItem(
+    val useSpeck: MvUseSpeck,
+    val nameOrAlias: String,
+    val type: UseItemType,
+    val scope: NamedItemScope
+)
+
+val MvItemsOwner.useItems: List<UseItem>
+    get() = this.useStmtList.flatMap { it.useItems }
+
+val MvUseStmt.useItems: List<UseItem>
+    get() {
+        val items = mutableListOf<UseItem>()
+        val stmtItemScope = this.declaredItemScope
+        this.forEachLeafSpeck { path, useAlias ->
+            val useSpeck = path.parent as MvUseSpeck
+            val nameOrAlias = useAlias?.name ?: path.referenceName ?: return@forEachLeafSpeck false
+            val pathKind = path.pathKind()
+            when (pathKind) {
+                is PathKind.QualifiedPath.Module ->
+                    items.add(UseItem(useSpeck, nameOrAlias, MODULE, stmtItemScope))
+                is PathKind.QualifiedPath.ModuleItem -> {
+                    debugError("not reachable, must be a bug")
+                    return@forEachLeafSpeck false
+                }
+                is PathKind.QualifiedPath -> {
+                    if (pathKind.path.referenceName == "Self") {
+                        val moduleName =
+                            useAlias?.name ?: pathKind.qualifier.referenceName ?: return@forEachLeafSpeck false
+                        items.add(UseItem(useSpeck, moduleName, SELF_MODULE, stmtItemScope))
+                    } else {
+                        items.add(UseItem(useSpeck, nameOrAlias, ITEM, stmtItemScope))
+                    }
+                }
+                else -> return@forEachLeafSpeck false
+            }
+            false
+        }
+
+        return items
+    }
diff --git a/src/main/kotlin/org/move/ide/intentions/RemoveCurlyBracesIntention.kt b/src/main/kotlin/org/move/ide/intentions/RemoveCurlyBracesIntention.kt
index 5f79728ed..efeaf1ccf 100644
--- a/src/main/kotlin/org/move/ide/intentions/RemoveCurlyBracesIntention.kt
+++ b/src/main/kotlin/org/move/ide/intentions/RemoveCurlyBracesIntention.kt
@@ -3,51 +3,72 @@ package org.move.ide.intentions
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
-import org.move.lang.core.psi.MvUseItemGroup
+import org.move.lang.core.psi.MvUseSpeck
 import org.move.lang.core.psi.MvUseStmt
 import org.move.lang.core.psi.ext.ancestorStrict
 import org.move.lang.core.psi.ext.endOffset
 import org.move.lang.core.psi.ext.startOffset
 import org.move.lang.core.psi.psiFactory
 
-class RemoveCurlyBracesIntention : MvElementBaseIntentionAction<RemoveCurlyBracesIntention.Context>() {
+class RemoveCurlyBracesIntention: MvElementBaseIntentionAction<RemoveCurlyBracesIntention.Context>() {
     override fun getText(): String = "Remove curly braces"
     override fun getFamilyName(): String = text
 
-    data class Context(val itemUseGroup: MvUseItemGroup)
+    data class Context(val useSpeck: MvUseSpeck)
 
     override fun findApplicableContext(project: Project, editor: Editor, element: PsiElement): Context? {
         val useStmt = element.ancestorStrict<MvUseStmt>() ?: return null
-        val useItemGroup = useStmt.itemUseSpeck?.useItemGroup ?: return null
-        if (useItemGroup.useItemList.size > 1) return null
-        return Context(useItemGroup)
+        val useSpeck = useStmt.useSpeck ?: return null
+        val useGroup = useSpeck.useGroup ?: return null
+        if (useGroup.useSpeckList.size > 1) return null
+        return Context(useSpeck)
     }
 
     override fun invoke(project: Project, editor: Editor, ctx: Context) {
-        val itemUseGroup = ctx.itemUseGroup
+        val useSpeck = ctx.useSpeck
 
         // Save the cursor position, adjusting for curly brace removal
         val caret = editor.caretModel.offset
         val newOffset = when {
-            caret < itemUseGroup.startOffset -> caret
-            caret < itemUseGroup.endOffset -> caret - 1
+            caret < useSpeck.startOffset -> caret
+            caret < useSpeck.endOffset -> caret - 1
             else -> caret - 2
         }
-        itemUseGroup.removeCurlyBraces()
+        useSpeck.removeCurlyBraces()
         editor.caretModel.moveToOffset(newOffset)
     }
 }
 
-private fun MvUseItemGroup.removeCurlyBraces() {
+private fun MvUseSpeck.removeCurlyBraces() {
     val psiFactory = this.project.psiFactory
-    val itemUse = this.useItemList.singleOrNull() ?: return
-    val refName = itemUse.referenceName
-    val aliasName = itemUse.useAlias?.name
+    val useGroup = this.useGroup ?: return
+    val itemUseSpeck = useGroup.useSpeckList.singleOrNull() ?: return
 
-    var newText = refName
-    if (aliasName != null) {
-        newText += " as $aliasName"
+    val newPath = psiFactory.path("0x1::dummy::call")
+
+    val itemIdentifier = itemUseSpeck.path.identifier ?: return
+    // copy identifier
+    newPath.identifier?.replace(itemIdentifier.copy())
+    // copy module path
+    newPath.path?.replace(this.path.copy())
+
+    val dummyUseSpeck = psiFactory.useSpeck("0x1::dummy::call as mycall")
+    dummyUseSpeck.path.replace(newPath)
+
+    val useAlias = itemUseSpeck.useAlias
+    if (useAlias != null) {
+        dummyUseSpeck.useAlias?.replace(useAlias)
+    } else {
+        dummyUseSpeck.useAlias?.delete()
     }
-    val newItemUse = psiFactory.useItem(newText)
-    this.replace(newItemUse)
+
+
+//    val aliasName = itemUseSpeck.useAlias?.name
+//
+//    var newText = refName
+//    if (aliasName != null) {
+//        newText += " as $aliasName"
+//    }
+//    val newItemUse = psiFactory.useSpeckForGroup(newText)
+    this.replace(dummyUseSpeck)
 }
diff --git a/src/main/kotlin/org/move/ide/refactoring/MvImportOptimizer.kt b/src/main/kotlin/org/move/ide/refactoring/MvImportOptimizer.kt
index 7b36293b0..598106157 100644
--- a/src/main/kotlin/org/move/ide/refactoring/MvImportOptimizer.kt
+++ b/src/main/kotlin/org/move/ide/refactoring/MvImportOptimizer.kt
@@ -5,11 +5,10 @@ import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.lang.ImportOptimizer
 import com.intellij.psi.*
 import org.move.ide.inspections.MvUnusedImportInspection
-import org.move.ide.inspections.imports.ImportAnalyzer
+import org.move.ide.inspections.imports.ImportAnalyzer2
 import org.move.ide.utils.imports.COMPARATOR_FOR_ITEMS_IN_USE_GROUP
 import org.move.ide.utils.imports.UseStmtWrapper
 import org.move.lang.MoveFile
-import org.move.lang.MvElementTypes.L_BRACE
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
 import org.move.stdext.withNext
@@ -27,10 +26,10 @@ class MvImportOptimizer : ImportOptimizer {
         }
 
         val holder = ProblemsHolder(InspectionManager.getInstance(file.project), file, false)
-        val importVisitor = ImportAnalyzer(holder)
+        val importVisitor = ImportAnalyzer2(holder)
         object : PsiRecursiveElementVisitor() {
             override fun visitElement(element: PsiElement) {
-                if (element is MvImportsOwner) {
+                if (element is MvItemsOwner) {
                     importVisitor.analyzeImportsOwner(element)
                 } else {
                     super.visitElement(element)
@@ -45,11 +44,11 @@ class MvImportOptimizer : ImportOptimizer {
                     (useElement.nextSibling as? PsiWhiteSpace)?.delete()
                     useElement.delete()
                 }
-                is MvUseItem -> {
+                is MvUseSpeck -> {
                     // remove whitespace following comma, if first position in a group
-                    val useItemGroup = useElement.parent as? MvUseItemGroup
-                    if (useItemGroup != null
-                        && useItemGroup.useItemList.firstOrNull() == useElement
+                    val useGroup = useElement.parent as? MvUseGroup
+                    if (useGroup != null
+                        && useGroup.useSpeckList.firstOrNull() == useElement
                     ) {
                         val followingComma = useElement.getNextNonCommentSibling()
                         followingComma?.rightSiblings
@@ -66,9 +65,9 @@ class MvImportOptimizer : ImportOptimizer {
         val useStmtsWithOwner = file.descendantsOfType<MvUseStmt>().groupBy { it.parent }
         for ((stmtOwner, useStmts) in useStmtsWithOwner.entries) {
             useStmts.forEach { useStmt ->
-                useStmt.itemUseSpeck?.let {
+                useStmt.useSpeck?.let {
                     removeCurlyBracesIfPossible(it, psiFactory)
-                    it.useItemGroup?.sortUseItems()
+                    it.useGroup?.sortUseSpecks()
                 }
             }
             if (stmtOwner is MvModuleBlock) {
@@ -77,82 +76,52 @@ class MvImportOptimizer : ImportOptimizer {
         }
     }
 
-    private fun mergeItemGroups(useStmtOwner: MvImportsOwner) {
-        val psiFactory = useStmtOwner.project.psiFactory
-        val leftBrace = useStmtOwner.findFirstChildByType(L_BRACE) ?: return
+    /** Returns true if successfully removed, e.g. `use aaa::{bbb};` -> `use aaa::bbb;` */
+    private fun removeCurlyBracesIfPossible(rootUseSpeck: MvUseSpeck, psiFactory: MvPsiFactory) {
+        val itemUseSpeck = rootUseSpeck.useGroup?.asTrivial ?: return
 
-        val useStmts = useStmtOwner.useStmtList
-        useStmts
-            .groupBy { Pair(it.fqModuleText, it.hasTestOnlyAttr) }
-            .forEach { (key, stmts) ->
-                val (fqModuleText, isTestOnly) = key
-                if (fqModuleText == null) return@forEach
+        val newUseSpeck = psiFactory.useSpeck("0x1::dummy::call")
+        val newUseSpeckPath = newUseSpeck.path
+        newUseSpeckPath.path?.replace(rootUseSpeck.path)
+        itemUseSpeck.path.identifier?.let { newUseSpeckPath.identifier?.replace(it) }
 
-                // special case: if single stmt and import like `use 0x1::Main::Self;`, change to `0x1::Main`
-//                if (stmts.size == 1) {
-//                    val stmt = stmts.single()
-//                    val useItem = stmt.childUseItems.singleOrNull()?.takeIf { it.text == "Self" }
-//                    if (useItem != null) {
-//                        val newStmt = psiFactory.useStmt(fqModuleText, isTestOnly)
-//                        stmt.replace(newStmt)
-//                    }
-//                    return@forEach
-//                }
-
-                val useItemNames = mutableListOf<String>()
-                if (stmts.any { it.moduleUseSpeck != null }) {
-                    useItemNames.add("Self")
-                }
-                useItemNames.addAll(stmts.flatMap { it.childUseItems }.map { it.text })
-                val newStmt =
-                    psiFactory.useStmt(
-                        "$fqModuleText::{${useItemNames.joinToString(", ")}}",
-                        isTestOnly
-                    )
-                useStmtOwner.addAfter(newStmt, leftBrace)
-                stmts.forEach { it.delete() }
-            }
-    }
-
-    companion object {
-        fun MvUseItemGroup.sortUseItems() {
-            val sortedList = useItemList
-                .sortedWith(COMPARATOR_FOR_ITEMS_IN_USE_GROUP)
-                .map { it.copy() }
-            useItemList.zip(sortedList).forEach { it.first.replace(it.second) }
+        val useAlias = itemUseSpeck.useAlias
+        if (useAlias != null) {
+            newUseSpeck.add(useAlias)
         }
 
-        /** Returns true if successfully removed, e.g. `use aaa::{bbb};` -> `use aaa::bbb;` */
-        private fun removeCurlyBracesIfPossible(useSpeck: MvItemUseSpeck, psiFactory: MvPsiFactory) {
-            val useItemText = useSpeck.useItemGroup?.asTrivial?.text ?: return
-            val fqModuleText = useSpeck.fqModuleRef.text
-            val newUseSpeck = psiFactory.itemUseSpeck(fqModuleText, useItemText)
-            useSpeck.replace(newUseSpeck)
-        }
+        rootUseSpeck.replace(newUseSpeck)
+    }
 
-        private fun reorderUseStmtsIntoGroups(useScope: MvImportsOwner) {
-            val useStmts = useScope.useStmtList
-            val first = useScope.childrenOfType<MvElement>()
-                .firstOrNull { it !is MvAttr && it !is PsiComment } ?: return
-            val psiFactory = useScope.project.psiFactory
-            val sortedUses = useStmts
-                .asSequence()
-                .map { UseStmtWrapper(it) }
-                .sorted()
-            for ((useWrapper, nextUseWrapper) in sortedUses.withNext()) {
-                val addedUseItem = useScope.addBefore(useWrapper.useStmt, first)
-                useScope.addAfter(psiFactory.createNewline(), addedUseItem)
-                val addNewLine =
-                    useWrapper.packageGroupLevel != nextUseWrapper?.packageGroupLevel
+    private fun reorderUseStmtsIntoGroups(useScope: MvItemsOwner) {
+        val useStmts = useScope.useStmtList
+        val first = useScope.childrenOfType<MvElement>()
+            .firstOrNull { it !is MvAttr && it !is PsiComment } ?: return
+        val psiFactory = useScope.project.psiFactory
+        val sortedUses = useStmts
+            .asSequence()
+            .map { UseStmtWrapper(it) }
+            .sorted()
+        for ((useWrapper, nextUseWrapper) in sortedUses.withNext()) {
+            val addedUseItem = useScope.addBefore(useWrapper.useStmt, first)
+            useScope.addAfter(psiFactory.createNewline(), addedUseItem)
+            val addNewLine =
+                useWrapper.packageGroupLevel != nextUseWrapper?.packageGroupLevel
 //                            && (nextUseWrapper != null || useScope is MvModuleBlock)
-                if (addNewLine) {
-                    useScope.addAfter(psiFactory.createNewline(), addedUseItem)
-                }
-            }
-            useStmts.forEach {
-                (it.nextSibling as? PsiWhiteSpace)?.delete()
-                it.delete()
+            if (addNewLine) {
+                useScope.addAfter(psiFactory.createNewline(), addedUseItem)
             }
         }
+        useStmts.forEach {
+            (it.nextSibling as? PsiWhiteSpace)?.delete()
+            it.delete()
+        }
+    }
+
+    private fun MvUseGroup.sortUseSpecks() {
+        val sortedList = useSpeckList
+            .sortedWith(COMPARATOR_FOR_ITEMS_IN_USE_GROUP)
+            .map { it.copy() }
+        useSpeckList.zip(sortedList).forEach { it.first.replace(it.second) }
     }
 }
diff --git a/src/main/kotlin/org/move/ide/search/MvUsageTypeProvider.kt b/src/main/kotlin/org/move/ide/search/MvUsageTypeProvider.kt
index ef705a82d..21c6aaf96 100644
--- a/src/main/kotlin/org/move/ide/search/MvUsageTypeProvider.kt
+++ b/src/main/kotlin/org/move/ide/search/MvUsageTypeProvider.kt
@@ -11,9 +11,8 @@ import com.intellij.usages.impl.rules.UsageType
 import com.intellij.usages.impl.rules.UsageTypeProviderEx
 import org.move.lang.core.psi.MvAddressRef
 import org.move.lang.core.psi.MvExpr
-import org.move.lang.core.psi.MvFQModuleRef
 
-object MvUsageTypeProvider : UsageTypeProviderEx {
+object MvUsageTypeProvider: UsageTypeProviderEx {
     // Instantiate each UsageType only once, so that the equality check in UsageTypeGroup.equals() works correctly
 //    private val TYPE_REFERENCE = UsageType { "type reference" }
 
@@ -46,9 +45,8 @@ object MvUsageTypeProvider : UsageTypeProviderEx {
     }
 
     override fun getUsageType(element: PsiElement, targets: Array<out UsageTarget>): UsageType? {
-//        val refinedElement = element?.findExpansionElements()?.firstOrNull()?.parent ?: element
         val parent = element.parent ?: return null
-        if (element is MvFQModuleRef) return MODULE
+//        if (element is MvFQModuleRef) return MODULE
         return when (parent) {
             is MvExpr -> EXPR
             is MvAddressRef -> ADDRESS_REF
diff --git a/src/main/kotlin/org/move/ide/structureView/MvStructureViewTreeElement.kt b/src/main/kotlin/org/move/ide/structureView/MvStructureViewTreeElement.kt
index 1ab179473..14b48bca5 100644
--- a/src/main/kotlin/org/move/ide/structureView/MvStructureViewTreeElement.kt
+++ b/src/main/kotlin/org/move/ide/structureView/MvStructureViewTreeElement.kt
@@ -16,7 +16,7 @@ class MvStructureViewTreeElement(val element: NavigatablePsiElement): StructureV
     val isPublic: Boolean
         get() {
             return when (element) {
-                is MvFunction -> element.visibility != FunctionVisibility.PRIVATE
+                is MvFunction -> element.isPublic
                 is MvConst -> false
                 else -> true
             }
diff --git a/src/main/kotlin/org/move/ide/utils/FunctionSignature.kt b/src/main/kotlin/org/move/ide/utils/FunctionSignature.kt
index 7b6796aeb..1232b1d52 100644
--- a/src/main/kotlin/org/move/ide/utils/FunctionSignature.kt
+++ b/src/main/kotlin/org/move/ide/utils/FunctionSignature.kt
@@ -44,11 +44,11 @@ data class FunctionSignature(
         fun resolve(callable: MvCallable): FunctionSignature? =
             when (callable) {
                 is MvCallExpr -> {
-                    val function = callable.path.reference?.resolveWithAliases() as? MvFunction
+                    val function = callable.path.reference?.resolveFollowingAliases() as? MvFunction
                     function?.getSignature()
                 }
                 is MvMethodCall -> {
-                    val function = callable.reference.resolveWithAliases() as? MvFunction
+                    val function = callable.reference.resolveFollowingAliases() as? MvFunction
                     function?.getSignature()
                 }
                 else -> null
diff --git a/src/main/kotlin/org/move/ide/utils/imports/ImportCandidate.kt b/src/main/kotlin/org/move/ide/utils/imports/ImportCandidate.kt
index 8547d8035..5c0face34 100644
--- a/src/main/kotlin/org/move/ide/utils/imports/ImportCandidate.kt
+++ b/src/main/kotlin/org/move/ide/utils/imports/ImportCandidate.kt
@@ -1,88 +1,6 @@
 package org.move.ide.utils.imports
 
-import org.move.ide.inspections.imports.ImportContext
-import org.move.lang.MoveFile
-import org.move.lang.core.psi.MvNamedElement
 import org.move.lang.core.psi.MvQualNamedElement
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.MatchingProcessor
-import org.move.lang.core.resolve.processModuleInnerItems
-import org.move.lang.core.resolve.processQualItem
-import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
 import org.move.lang.core.types.ItemQualName
-import org.move.lang.index.MvNamedElementIndex
-import org.move.lang.moveProject
-import org.move.openapiext.common.checkUnitTestMode
-import org.move.openapiext.common.isUnitTestMode
 
 data class ImportCandidate(val element: MvQualNamedElement, val qualName: ItemQualName)
-
-object ImportCandidateCollector {
-    fun getImportCandidates(
-        context: ImportContext,
-        targetName: String,
-        itemFilter: (MvQualNamedElement) -> Boolean = { true }
-    ): List<ImportCandidate> {
-        val (contextElement, namespaces, visibilities, itemVis) = context
-
-        val project = contextElement.project
-        val moveProject = contextElement.moveProject ?: return emptyList()
-        val searchScope = moveProject.searchScope()
-
-        val allItems = mutableListOf<MvQualNamedElement>()
-        if (isUnitTestMode) {
-            // always add current file in tests
-            val currentFile = contextElement.containingFile as? MoveFile ?: return emptyList()
-
-            val items = mutableListOf<MvQualNamedElement>()
-            processFileItemsForUnitTests(currentFile, namespaces, visibilities, itemVis) {
-                if (it.element is MvQualNamedElement && it.name == targetName) {
-                    items.add(it.element)
-                }
-                false
-            }
-//            return elements
-
-//            val items = currentFile.qualifiedItems(targetName, namespaces, visibilities, itemVis)
-            allItems.addAll(items)
-        }
-
-        MvNamedElementIndex
-            .processElementsByName(project, targetName, searchScope) { element ->
-                processQualItem(element, namespaces, visibilities, itemVis) {
-                    val entryElement = it.element
-                    if (entryElement !is MvQualNamedElement) return@processQualItem false
-                    if (it.name == targetName) {
-                        allItems.add(entryElement)
-                    }
-                    false
-                }
-                true
-            }
-
-        return allItems
-            .filter(itemFilter)
-            .mapNotNull { item -> item.qualName?.let { ImportCandidate(item, it) } }
-    }
-}
-
-private fun processFileItemsForUnitTests(
-    file: MoveFile,
-    namespaces: Set<Namespace>,
-    visibilities: Set<Visibility>,
-    contextScopeInfo: ContextScopeInfo,
-    processor: MatchingProcessor<MvNamedElement>,
-): Boolean {
-    checkUnitTestMode()
-    for (module in file.modules()) {
-        if (
-            Namespace.MODULE in namespaces
-            && processor.match(contextScopeInfo, module)
-        ) {
-            return true
-        }
-        if (processModuleInnerItems(module, namespaces, visibilities, contextScopeInfo, processor)) return true
-    }
-    return false
-}
diff --git a/src/main/kotlin/org/move/ide/utils/imports/ImportCandidateCollector.kt b/src/main/kotlin/org/move/ide/utils/imports/ImportCandidateCollector.kt
new file mode 100644
index 000000000..42e649bce
--- /dev/null
+++ b/src/main/kotlin/org/move/ide/utils/imports/ImportCandidateCollector.kt
@@ -0,0 +1,89 @@
+package org.move.ide.utils.imports
+
+import com.intellij.codeInsight.completion.CompletionParameters
+import com.intellij.codeInsight.completion.PrefixMatcher
+import com.intellij.psi.PsiElement
+import org.move.ide.inspections.imports.ImportContext
+import org.move.lang.core.psi.MvQualNamedElement
+import org.move.lang.core.resolve.VisibilityStatus.Visible
+import org.move.lang.core.resolve2.createFilter
+import org.move.lang.core.resolve2.namespace
+import org.move.lang.core.resolve2.visInfo
+import org.move.lang.index.MvNamedElementIndex
+import org.move.lang.moveProject
+
+object ImportCandidateCollector {
+
+    fun getImportCandidates(context: ImportContext, targetName: String): List<ImportCandidate> {
+        val (pathElement, namespaces) = context
+
+        val project = pathElement.project
+        val moveProject = pathElement.moveProject ?: return emptyList()
+        val searchScope = moveProject.searchScope()
+
+        val allItems = mutableListOf<MvQualNamedElement>()
+//        if (isUnitTestMode) {
+//            // always add current file in tests
+//            val currentFile = pathElement.containingFile as? MoveFile ?: return emptyList()
+//            val items = mutableListOf<MvQualNamedElement>()
+//            processFileItemsForUnitTests(currentFile, namespaces, visibilities, itemVis, createProcessor {
+//                val element = it.element
+//                if (element is MvQualNamedElement && it.name == targetName) {
+//                    items.add(element)
+//                }
+//            })
+//            allItems.addAll(items)
+//        }
+
+        MvNamedElementIndex
+            .processElementsByName(project, targetName, searchScope) { element ->
+                val elementNs = element.namespace
+                if (elementNs !in namespaces) return@processElementsByName true
+                val visibilityFilter = element.visInfo().createFilter()
+
+                val visibilityStatus = visibilityFilter.filter(pathElement, namespaces)
+                if (visibilityStatus != Visible) return@processElementsByName true
+
+                if (element !is MvQualNamedElement) return@processElementsByName true
+                if (element.name == targetName) {
+                    allItems.add(element)
+                }
+
+//                processQualItem(element, namespaces, visibilities, itemVis) {
+//                    val entryElement = it.element
+//                    if (entryElement !is MvQualNamedElement) return@processQualItem true
+//                    if (it.name == targetName) {
+//                        allItems.add(entryElement)
+//                    }
+//                    false
+//                }
+                true
+            }
+
+        return allItems
+//            .filter(itemFilter)
+            .mapNotNull { item -> item.qualName?.let { ImportCandidate(item, it) } }
+    }
+
+    fun getCompletionCandidates(
+        parameters: CompletionParameters,
+        prefixMatcher: PrefixMatcher,
+        processedPathNames: Set<String>,
+        importContext: ImportContext,
+        itemFilter: (PsiElement) -> Boolean = { true }
+    ): List<ImportCandidate> {
+        val project = parameters.position.project
+        val keys = hashSetOf<String>().apply {
+            val names = MvNamedElementIndex.getAllKeys(project)
+            addAll(names)
+            removeAll(processedPathNames)
+        }
+
+        return prefixMatcher.sortMatching(keys)
+            .flatMap {
+                getImportCandidates(importContext, it)
+                    .distinctBy { it.element }
+                    .filter { itemFilter(it.element) }
+            }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/ide/utils/imports/ImportUtils.kt b/src/main/kotlin/org/move/ide/utils/imports/ImportUtils.kt
index d933b52a4..5faf7931a 100644
--- a/src/main/kotlin/org/move/ide/utils/imports/ImportUtils.kt
+++ b/src/main/kotlin/org/move/ide/utils/imports/ImportUtils.kt
@@ -1,9 +1,7 @@
 package org.move.ide.utils.imports
 
 import org.move.lang.core.psi.*
-import org.move.lang.core.psi.ext.childrenOfType
-import org.move.lang.core.psi.ext.hasTestOnlyAttr
-import org.move.lang.core.psi.ext.names
+import org.move.lang.core.psi.ext.*
 import org.move.lang.core.types.ItemQualName
 import org.move.openapiext.checkWriteAccessAllowed
 
@@ -22,7 +20,7 @@ fun ImportCandidate.import(context: MvElement) {
     insertionScope.insertUseItem(qualName, insertTestOnly)
 }
 
-private fun MvImportsOwner.insertUseItem(usePath: ItemQualName, testOnly: Boolean) {
+private fun MvItemsOwner.insertUseItem(usePath: ItemQualName, testOnly: Boolean) {
 
     if (tryInsertingIntoExistingUseStmt(this, usePath, testOnly)) return
 
@@ -41,62 +39,125 @@ private fun MvImportsOwner.insertUseItem(usePath: ItemQualName, testOnly: Boolea
 }
 
 private fun tryInsertingIntoExistingUseStmt(
-    mod: MvImportsOwner,
-    usePath: ItemQualName,
+    mod: MvItemsOwner,
+    itemQualName: ItemQualName,
     testOnly: Boolean
 ): Boolean {
-    if (usePath.moduleName == null) return false
+    if (itemQualName.moduleName == null) return false
     val psiFactory = mod.project.psiFactory
-    return mod
-        .useStmtList
-        .filter { it.hasTestOnlyAttr == testOnly }
-        .mapNotNull { it.itemUseSpeck }
-        .any { tryGroupWithItemSpeck(psiFactory, it, usePath) }
+    val useStmts = mod.useStmtList.filter { it.hasTestOnlyAttr == testOnly }
+    return useStmts
+        .any { tryGroupWithItemSpeck(psiFactory, it, itemQualName) }
 }
 
 private fun tryGroupWithItemSpeck(
-    psiFactory: MvPsiFactory, itemUseSpeck: MvItemUseSpeck, usePath: ItemQualName
+    psiFactory: MvPsiFactory, useStmt: MvUseStmt, itemQualName: ItemQualName
 ): Boolean {
-    val fqModuleName = usePath.editorModuleFqName() ?: error("checked in the upper level")
-    if (!itemUseSpeck.fqModuleRef.textMatches(fqModuleName)) return false
+    val rootUseSpeck = useStmt.useSpeck ?: return false
 
-    val itemName = usePath.itemName
-    if (itemName in itemUseSpeck.names()) return true
+    val useGroup = rootUseSpeck.useGroup
+    // 0x1::m -> module imports does not support groups, can't insert
+    if (useGroup == null && rootUseSpeck.path.length < 3) return false
 
-    val useItem = psiFactory.useItem(itemName)
-    val useItemGroup = itemUseSpeck.useItemGroup
-    if (useItemGroup != null) {
+    // searching for the statement with the same module qualifier
+    val itemModulePath = itemQualName.editorModuleFqName() ?: error("moduleName cannot be zero")
+    if (useGroup == null) {
+        val modulePath = rootUseSpeck.path.qualifier ?: return false
+        if (!modulePath.textMatches(itemModulePath)) return false
+    } else {
+        val modulePath = rootUseSpeck.path
+        if (!modulePath.textMatches(itemModulePath)) return false
+    }
+
+    val itemName = itemQualName.itemName
+    val newUseSpeck = psiFactory.useSpeckForGroup(itemName)
+
+    if (useGroup == null) {
+        // 0x1::dummy::{}
+        val useSpeckWithGroup = psiFactory.useSpeckWithEmptyUseGroup()
+
+        // [0x1::m]::item
+        //  ^ qualifier
+        val qualifier = rootUseSpeck.path.qualifier ?: return false
+        // 0x1::dummy::{} -> 0x1::m::{}
+        useSpeckWithGroup.path.replace(qualifier)
+
+        // 0x1::m::{} -> 0x1::m::{item as dummy}
+        val existingItemName = rootUseSpeck.path.referenceName ?: return false
+        val groupItemUseSpeck = psiFactory.useSpeckForGroupWithDummyAlias(existingItemName)
+
+        // 0x1::m::{item as dummy} -> 0x1::m::{item as myitem}
+        val existingUseAlias = rootUseSpeck.useAlias
+        if (existingUseAlias != null) {
+            groupItemUseSpeck.useAlias?.replace(existingUseAlias)
+        } else {
+            groupItemUseSpeck.useAlias?.delete()
+        }
+
+        val newUseGroup = useSpeckWithGroup.useGroup!!
+        newUseGroup.addAfter(groupItemUseSpeck, newUseGroup.lBrace)
+
+        // 0x1::m::{item as myitem} -> 0x1::m::{item as myitem, }
+        val comma = newUseGroup.addBefore(psiFactory.createComma(), newUseGroup.rBrace)
+
+        // 0x1::m::{item as myitem, } -> 0x1::m::{item as myitem, item2}
+        newUseGroup.addAfter(newUseSpeck, comma)
+
+        useSpeckWithGroup.useGroup?.replace(newUseGroup)
+        useStmt.useSpeck?.replace(useSpeckWithGroup)
+    } else {
         // add after the last item
-        val itemList = useItemGroup.useItemList
-        if (itemList.isEmpty()) {
+        val useSpeckList = useGroup.useSpeckList
+        if (useSpeckList.isEmpty()) {
             // use 0x1::m::{};
-            useItemGroup.addAfter(useItem, useItemGroup.lBrace)
+            useGroup.addAfter(newUseSpeck, useGroup.lBrace)
         } else {
             // use 0x1::m::{item1} -> use 0x1::m::{item1, item2}
-            val lastItem = itemList.last()
-            useItemGroup.addAfter(
-                useItem,
-                useItemGroup.addAfter(psiFactory.createComma(), lastItem)
-            )
+            val lastItem = useSpeckList.last()
+            val newComma = useGroup.addAfter(psiFactory.createComma(), lastItem)
+            useGroup.addAfter(newUseSpeck, newComma)
         }
-    } else {
-        val existingItem = itemUseSpeck.useItem ?: return true
+    }
 
-        val existingItemCopy = existingItem.copy()
-        val itemGroup = existingItem.replace(psiFactory.useItemGroup(listOf())) as MvUseItemGroup
+//    val useItems = useStmt.useItems
+//    if (useItems.all { it.type == MODULE }) return false
+//
+//    val itemUseItem = useItems.firstOrNull() ?: return false
+//    val itemUseSpeck = itemUseItem.useSpeck
+//    val qualifier = itemUseSpeck.qualifier ?: itemUseSpeck.path.qualifier ?: return false
+//
+//    val fqModuleName = usePath.editorModuleFqName() ?: error("checked in the upper level")
+//    if (!qualifier.textMatches(fqModuleName)) return false
 
-        val comma = itemGroup.addAfter(
-            psiFactory.createComma(),
-            itemGroup.addAfter(existingItemCopy, itemGroup.lBrace)
-        )
-        itemGroup.addAfter(useItem, comma)
-    }
+//    val itemName = usePath.itemName
+//    val useStmtNames = useItems.map { it.nameOrAlias }
+//    if (itemName in useStmtNames) return true
+
+//    val useGroup = itemUseSpeck.useGroup
+//    val useSpeck = psiFactory.useSpeckForGroup(itemName)
+//    if (useGroup != null) {
+//        // add after the last item
+//        val useSpeckList = useGroup.useSpeckList
+//        if (useSpeckList.isEmpty()) {
+//            // use 0x1::m::{};
+//            useGroup.addAfter(useSpeck, useGroup.lBrace)
+//        } else {
+//            // use 0x1::m::{item1} -> use 0x1::m::{item1, item2}
+//            val lastItem = useSpeckList.last()
+//            useGroup.addAfter(
+//                useSpeck,
+//                useGroup.addAfter(psiFactory.createComma(), lastItem)
+//            )
+//        }
+//    } else {
+//    }
     return true
 }
 
-private val <T : MvElement> List<T>.lastElement: T? get() = maxByOrNull { it.textOffset }
+private val <T: MvElement> List<T>.lastElement: T? get() = maxByOrNull { it.textOffset }
 
-private fun insertUseStmtAtTheCorrectLocation(mod: MvImportsOwner, useStmt: MvUseStmt): Boolean {
+@Suppress("SameReturnValue")
+private fun insertUseStmtAtTheCorrectLocation(mod: MvItemsOwner, useStmt: MvUseStmt): Boolean {
     val psiFactory = MvPsiFactory(mod.project)
     val newline = psiFactory.createNewline()
     val useStmts = mod.childrenOfType<MvUseStmt>().map(::UseStmtWrapper)
diff --git a/src/main/kotlin/org/move/ide/utils/imports/UseStmtWrapper.kt b/src/main/kotlin/org/move/ide/utils/imports/UseStmtWrapper.kt
index 556e61464..9b1474c3b 100644
--- a/src/main/kotlin/org/move/ide/utils/imports/UseStmtWrapper.kt
+++ b/src/main/kotlin/org/move/ide/utils/imports/UseStmtWrapper.kt
@@ -5,13 +5,23 @@
 
 package org.move.ide.utils.imports
 
-import org.move.lang.core.psi.MvAddressRef
-import org.move.lang.core.psi.MvUseItem
+import org.move.cli.MoveProject
+import org.move.lang.core.psi.MvUseSpeck
 import org.move.lang.core.psi.MvUseStmt
-import org.move.lang.core.psi.ext.*
+import org.move.lang.core.psi.ext.basePath
+import org.move.lang.core.psi.ext.hasTestOnlyAttr
+import org.move.lang.core.psi.ext.hasVerifyOnlyAttr
+import org.move.lang.core.psi.ext.isSelf
+import org.move.lang.moveProject
 
-class UseStmtWrapper(val useStmt: MvUseStmt) : Comparable<UseStmtWrapper> {
-    private val addr: MvAddressRef? get() = this.useStmt.addressRef
+class UseStmtWrapper(val useStmt: MvUseStmt): Comparable<UseStmtWrapper> {
+    private val namedAddress: String?
+        get() {
+            val useSpeck = useStmt.useSpeck ?: return null
+            val base = useSpeck.path.basePath()
+            if (base.pathAddress != null) return null
+            return base.identifier?.text
+        }
 
     // `use` order:
     // 1. Standard library (stdlib)
@@ -24,35 +34,41 @@ class UseStmtWrapper(val useStmt: MvUseStmt) : Comparable<UseStmtWrapper> {
     val packageGroupLevel: Int = when {
         this.useStmt.hasTestOnlyAttr -> 5
         this.useStmt.hasVerifyOnlyAttr -> 6
-        else -> this.addr?.useGroupLevel ?: -1
+        else -> getBetweenGroupsLevel(this.namedAddress, useStmt.moveProject)
     }
 
-    val addressLevel: Int = when (this.addr?.namedAddress?.referenceName?.lowercase()) {
+    override fun compareTo(other: UseStmtWrapper): Int =
+        compareValuesBy(
+            this,
+            other,
+            { it.packageGroupLevel },
+            { getWithinGroupLevel(it.namedAddress) },
+            { it.useStmt.useSpeck?.text ?: "" }
+        )
+}
+
+val COMPARATOR_FOR_ITEMS_IN_USE_GROUP: Comparator<MvUseSpeck> =
+    compareBy<MvUseSpeck> { !it.isSelf }.thenBy { it.path.referenceName?.lowercase() }
+
+private fun getWithinGroupLevel(namedAddress: String?): Int =
+    when (namedAddress?.lowercase()) {
         "std" -> 0
         "aptos_std" -> 1
         "aptos_framework" -> 2
         "aptos_token" -> 3
         else -> 4
     }
-//    val packageGroupLevel: Int = when {
-//
-//        basePath?.self != null -> 6
-//        basePath?.`super` != null -> 5
-//        basePath?.crate != null -> 4
-//        else -> when (basePath?.reference?.resolve()?.containingCrate?.origin) {
-//            PackageOrigin.WORKSPACE -> 3
-//            PackageOrigin.DEPENDENCY -> 2
-//            PackageOrigin.STDLIB, PackageOrigin.STDLIB_DEPENDENCY -> 1
-//            null -> 3
-//        }
-//    }
 
-    override fun compareTo(other: UseStmtWrapper): Int =
-        compareValuesBy(
-            this, other,
-            { it.packageGroupLevel }, { it.addressLevel }, { it.useStmt.useSpeckText }
-        )
-}
+private fun getBetweenGroupsLevel(namedAddress: String?, moveProject: MoveProject?): Int {
+    // sort to the end if not a named address
+    if (namedAddress == null) return 4
 
-val COMPARATOR_FOR_ITEMS_IN_USE_GROUP: Comparator<MvUseItem> =
-    compareBy<MvUseItem> { !it.isSelf }.thenBy { it.referenceName.lowercase() }
+    val name = namedAddress.lowercase()
+    val currentPackageAddresses =
+        moveProject?.currentPackageAddresses()?.keys.orEmpty().map { it.lowercase() }
+    return when (name) {
+        "std", "aptos_std", "aptos_framework", "aptos_token" -> 1
+        !in currentPackageAddresses -> 2
+        else -> 3
+    }
+}
diff --git a/src/main/kotlin/org/move/lang/MoveFile.kt b/src/main/kotlin/org/move/lang/MoveFile.kt
index 054c7caeb..668aea168 100644
--- a/src/main/kotlin/org/move/lang/MoveFile.kt
+++ b/src/main/kotlin/org/move/lang/MoveFile.kt
@@ -4,7 +4,6 @@ import com.intellij.extapi.psi.PsiFileBase
 import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.vfs.ex.temp.TempFileSystem
 import com.intellij.psi.FileViewProvider
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
diff --git a/src/main/kotlin/org/move/lang/MoveParserDefinition.kt b/src/main/kotlin/org/move/lang/MoveParserDefinition.kt
index 2317eaac1..10d9bc741 100644
--- a/src/main/kotlin/org/move/lang/MoveParserDefinition.kt
+++ b/src/main/kotlin/org/move/lang/MoveParserDefinition.kt
@@ -63,6 +63,6 @@ class MoveParserDefinition : ParserDefinition {
         /**
          * Should be increased after any change of parser rules
          */
-        const val PARSER_VERSION: Int = LEXER_VERSION + 49
+        const val PARSER_VERSION: Int = LEXER_VERSION + 50
     }
 }
diff --git a/src/main/kotlin/org/move/lang/core/completion/CommonCompletionContributor.kt b/src/main/kotlin/org/move/lang/core/completion/CommonCompletionContributor.kt
index 90626d122..fdf13423c 100644
--- a/src/main/kotlin/org/move/lang/core/completion/CommonCompletionContributor.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/CommonCompletionContributor.kt
@@ -10,29 +10,28 @@ import org.move.lang.core.psi.MvModule
 class CommonCompletionContributor : CompletionContributor() {
     init {
         extend(CompletionType.BASIC, PrimitiveTypesCompletionProvider)
-        extend(CompletionType.BASIC, NamesCompletionProvider)
-        extend(CompletionType.BASIC, FunctionsCompletionProvider)
-        extend(CompletionType.BASIC, SchemasCompletionProvider)
+//        extend(CompletionType.BASIC, NamesCompletionProvider)
+//        extend(CompletionType.BASIC, FunctionsCompletionProvider)
+//        extend(CompletionType.BASIC, SchemasCompletionProvider)
         extend(CompletionType.BASIC, SpecItemCompletionProvider)
-        extend(CompletionType.BASIC, AddressesCompletionProvider)
+
+        // addresses
+        extend(CompletionType.BASIC, NamedAddressInUseStmtCompletionProvider)
+        extend(CompletionType.BASIC, NamedAddressAtValueExprCompletionProvider)
         extend(CompletionType.BASIC, AddressInModuleDeclCompletionProvider)
-        extend(CompletionType.BASIC, TypesCompletionProvider)
-        extend(CompletionType.BASIC, ImportsCompletionProvider)
-        extend(CompletionType.BASIC, ModulesCompletionProvider)
-        extend(CompletionType.BASIC, FQModuleCompletionProvider)
+
+//        extend(CompletionType.BASIC, TypesCompletionProvider)
+//        extend(CompletionType.BASIC, ImportsCompletionProvider)
+//        extend(CompletionType.BASIC, ModulesCompletionProvider)
+//        extend(CompletionType.BASIC, FQModuleCompletionProvider)
         extend(CompletionType.BASIC, StructFieldsCompletionProvider)
         extend(CompletionType.BASIC, StructPatCompletionProvider)
         extend(CompletionType.BASIC, SchemaFieldsCompletionProvider)
-        extend(
-            CompletionType.BASIC,
-            MvPsiPatterns.ability(),
-            AbilitiesCompletionProvider
-        )
-        extend(
-            CompletionType.BASIC,
-            MvPsiPatterns.refExpr(),
-            BoolsCompletionProvider
-        )
+        extend(CompletionType.BASIC, MvPathCompletionProvider2)
+
+        extend(CompletionType.BASIC, MvPsiPatterns.ability(), AbilitiesCompletionProvider)
+        extend(CompletionType.BASIC, MvPsiPatterns.refExpr(), BoolsCompletionProvider)
+
         extend(CompletionType.BASIC, MacrosCompletionProvider)
         extend(CompletionType.BASIC, VectorLiteralCompletionProvider)
         extend(CompletionType.BASIC, MethodOrFieldCompletionProvider)
diff --git a/src/main/kotlin/org/move/lang/core/completion/LookupElements.kt b/src/main/kotlin/org/move/lang/core/completion/LookupElements.kt
index d9a48df98..4b247524a 100644
--- a/src/main/kotlin/org/move/lang/core/completion/LookupElements.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/LookupElements.kt
@@ -11,7 +11,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import org.move.ide.presentation.text
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
-import org.move.lang.core.resolve.ContextScopeInfo
+import org.move.lang.core.resolve2.ref.ResolutionContext
 import org.move.lang.core.types.infer.*
 import org.move.lang.core.types.ty.Ty
 import org.move.lang.core.types.ty.TyUnknown
@@ -54,103 +54,17 @@ fun MvNamedElement.createLookupElementWithIcon(): LookupElementBuilder {
         .withLookupString(this.name ?: "")
 }
 
-@Suppress("UnusedReceiverParameter")
-fun MvModule.createSelfLookup(): LookupElement {
-    return LookupElementBuilder
-        .create("Self")
-        .withBoldness(true)
-}
-
-fun MvNamedElement.getLookupElementBuilder(
-    completionCtx: CompletionContext,
-    subst: Substitution = emptySubstitution,
-    structAsType: Boolean = false
-): LookupElementBuilder {
-    val lookupElementBuilder = this.createLookupElementWithIcon()
-    val msl = completionCtx.isMsl()
-    return when (this) {
-        is MvFunction -> {
-            val signature = FuncSignature.fromFunction(this, msl).substitute(subst)
-            if (completionCtx.contextElement is MvMethodOrField) {
-                lookupElementBuilder
-                    .withTailText(signature.paramsText())
-                    .withTypeText(signature.retTypeText())
-            } else {
-                lookupElementBuilder
-                    .withTailText(this.signatureText)
-                    .withTypeText(this.outerFileName)
-            }
-        }
-        is MvSpecFunction -> lookupElementBuilder
-            .withTailText(this.parameters.joinToSignature())
-            .withTypeText(this.returnType?.type?.text ?: "()")
-
-        is MvModule -> lookupElementBuilder
-            .withTailText(this.addressRef()?.let { " ${it.text}" } ?: "")
-            .withTypeText(this.containingFile?.name)
-
-        is MvStruct -> {
-            val tailText = if (structAsType) "" else " { ... }"
-            lookupElementBuilder
-                .withTailText(tailText)
-                .withTypeText(this.containingFile?.name)
-        }
-
-        is MvStructField -> {
-            val fieldTy = this.type?.loweredType(msl)?.substitute(subst) ?: TyUnknown
-            lookupElementBuilder
-                .withTypeText(fieldTy.text(false))
-        }
-        is MvConst -> {
-//            val msl = this.isMslOnlyItem
-            val constTy = this.type?.loweredType(msl) ?: TyUnknown
-            lookupElementBuilder
-                .withTypeText(constTy.text(true))
-        }
-
-        is MvBindingPat -> {
-//            val msl = this.isMslOnlyItem
-            val bindingInference = this.inference(msl)
-            // race condition sometimes happens, when file is too big, inference is not finished yet
-            val ty = bindingInference?.getPatTypeOrUnknown(this) ?: TyUnknown
-            lookupElementBuilder
-                .withTypeText(ty.text(true))
-        }
-
-        is MvSchema -> lookupElementBuilder
-            .withTypeText(this.containingFile?.name)
-
-        // we need to do the resolve here and in the next one to get the underlying item,
-        // but it should be cached in the most cases
-        is MvModuleUseSpeck -> {
-            this.fqModuleRef?.reference?.resolve()
-                ?.getLookupElementBuilder(completionCtx, subst, structAsType)
-                ?: lookupElementBuilder
-        }
-
-        is MvUseItem -> {
-            this.reference.resolve()
-                ?.getLookupElementBuilder(completionCtx, subst, structAsType)
-                ?: lookupElementBuilder
-        }
-
-        else -> lookupElementBuilder
-    }
-}
-
 data class CompletionContext(
     val contextElement: MvElement,
-    val contextScopeInfo: ContextScopeInfo,
+    val msl: Boolean,
     val expectedTy: Ty? = null,
-) {
-    fun isMsl(): Boolean = contextScopeInfo.isMslScope
-}
-
+    val resolutionCtx: ResolutionContext? = null,
+    val structAsType: Boolean = false
+)
 
 fun MvNamedElement.createLookupElement(
     completionContext: CompletionContext,
     subst: Substitution = emptySubstitution,
-    structAsType: Boolean = false,
     priority: Double = DEFAULT_PRIORITY,
     insertHandler: InsertHandler<LookupElement> = DefaultInsertHandler(completionContext),
 ): LookupElement {
@@ -158,7 +72,7 @@ fun MvNamedElement.createLookupElement(
         this.getLookupElementBuilder(
             completionContext,
             subst = subst,
-            structAsType = structAsType
+            structAsType = completionContext.structAsType
         )
             .withInsertHandler(insertHandler)
             .withPriority(priority)
@@ -226,9 +140,11 @@ open class DefaultInsertHandler(val completionCtx: CompletionContext? = null): I
         item: LookupElement
     ) {
         val document = context.document
-
         when (element) {
             is MvFunctionLike -> {
+                // no suffix for imports
+                if (completionCtx?.resolutionCtx?.isUseSpeck == true) return
+
                 val isMethodCall = context.getElementOfType<MvMethodOrField>() != null
                 val requiresExplicitTypes =
                     element.requiresExplicitlyProvidedTypeArguments(completionCtx)
@@ -289,6 +205,83 @@ open class DefaultInsertHandler(val completionCtx: CompletionContext? = null): I
     }
 }
 
+private fun MvNamedElement.getLookupElementBuilder(
+    completionCtx: CompletionContext,
+    subst: Substitution = emptySubstitution,
+    structAsType: Boolean = false
+): LookupElementBuilder {
+    val lookupElementBuilder = this.createLookupElementWithIcon()
+    val msl = completionCtx.msl
+    return when (this) {
+        is MvFunction -> {
+            val signature = FuncSignature.fromFunction(this, msl).substitute(subst)
+            if (completionCtx.contextElement is MvMethodOrField) {
+                lookupElementBuilder
+                    .withTailText(signature.paramsText())
+                    .withTypeText(signature.retTypeText())
+            } else {
+                lookupElementBuilder
+                    .withTailText(this.signatureText)
+                    .withTypeText(this.outerFileName)
+            }
+        }
+        is MvSpecFunction -> lookupElementBuilder
+            .withTailText(this.parameters.joinToSignature())
+            .withTypeText(this.returnType?.type?.text ?: "()")
+
+        is MvModule -> lookupElementBuilder
+            .withTailText(this.addressRef()?.let { " ${it.text}" } ?: "")
+            .withTypeText(this.containingFile?.name)
+
+        is MvStruct -> {
+            val tailText = if (structAsType) "" else " { ... }"
+            lookupElementBuilder
+                .withTailText(tailText)
+                .withTypeText(this.containingFile?.name)
+        }
+
+        is MvStructField -> {
+            val fieldTy = this.type?.loweredType(msl)?.substitute(subst) ?: TyUnknown
+            lookupElementBuilder
+                .withTypeText(fieldTy.text(false))
+        }
+        is MvConst -> {
+//            val msl = this.isMslOnlyItem
+            val constTy = this.type?.loweredType(msl) ?: TyUnknown
+            lookupElementBuilder
+                .withTypeText(constTy.text(true))
+        }
+
+        is MvBindingPat -> {
+//            val msl = this.isMslOnlyItem
+            val bindingInference = this.inference(msl)
+            // race condition sometimes happens, when file is too big, inference is not finished yet
+            val ty = bindingInference?.getPatTypeOrUnknown(this) ?: TyUnknown
+            lookupElementBuilder
+                .withTypeText(ty.text(true))
+        }
+
+        is MvSchema -> lookupElementBuilder
+            .withTypeText(this.containingFile?.name)
+
+        // we need to do the resolve here and in the next one to get the underlying item,
+        // but it should be cached in the most cases
+//        is MvModuleUseSpeck -> {
+//            this.fqModuleRef?.reference?.resolve()
+//                ?.getLookupElementBuilder(completionCtx, subst, structAsType)
+//                ?: lookupElementBuilder
+//        }
+
+//        is MvUseItem -> {
+//            this.reference.resolve()
+//                ?.getLookupElementBuilder(completionCtx, subst, structAsType)
+//                ?: lookupElementBuilder
+//        }
+
+        else -> lookupElementBuilder
+    }
+}
+
 // When a user types `(` while completion,
 // `com.intellij.codeInsight.completion.DefaultCharFilter` invokes completion with selected item.
 // And if we insert `()` for the item (for example, function), a user get double parentheses
diff --git a/src/main/kotlin/org/move/lang/core/completion/LookupElements2.kt b/src/main/kotlin/org/move/lang/core/completion/LookupElements2.kt
new file mode 100644
index 000000000..f6a4e9742
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/completion/LookupElements2.kt
@@ -0,0 +1,92 @@
+package org.move.lang.core.completion
+
+import com.intellij.codeInsight.completion.InsertHandler
+import com.intellij.codeInsight.lookup.LookupElement
+import com.intellij.codeInsight.lookup.LookupElementBuilder
+import org.move.ide.presentation.text
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.ext.MvMethodOrField
+import org.move.lang.core.psi.ext.addressRef
+import org.move.lang.core.psi.ext.joinToSignature
+import org.move.lang.core.psi.ext.outerFileName
+import org.move.lang.core.resolve.ScopeEntry
+import org.move.lang.core.types.infer.*
+import org.move.lang.core.types.ty.TyUnknown
+
+fun createLookupElement(
+    scopeEntry: ScopeEntry,
+    completionContext: CompletionContext,
+    subst: Substitution = emptySubstitution,
+    priority: Double = DEFAULT_PRIORITY,
+    insertHandler: InsertHandler<LookupElement> = DefaultInsertHandler(completionContext)
+): LookupElement {
+    val element = scopeEntry.element
+    val lookup = element.getLookupElementBuilder(completionContext, scopeEntry.name, subst)
+        .withInsertHandler(insertHandler)
+        .withPriority(priority)
+    val props = getLookupElementProperties(element, subst, completionContext)
+    return lookup.toMvLookupElement(properties = props)
+}
+
+private fun MvNamedElement.getLookupElementBuilder(
+    context: CompletionContext,
+    scopeName: String,
+    subst: Substitution = emptySubstitution,
+): LookupElementBuilder {
+    val msl = context.msl
+    val base = LookupElementBuilder.createWithSmartPointer(scopeName, this)
+        .withIcon(this.getIcon(0))
+    return when (this) {
+        is MvFunction -> {
+            val signature = FuncSignature.fromFunction(this, msl).substitute(subst)
+            if (context.contextElement is MvMethodOrField) {
+                base
+                    .withTailText(signature.paramsText())
+                    .withTypeText(signature.retTypeText())
+            } else {
+                base
+                    .withTailText(this.signatureText)
+                    .withTypeText(this.outerFileName)
+            }
+        }
+        is MvSpecFunction -> base
+            .withTailText(this.parameters.joinToSignature())
+            .withTypeText(this.returnType?.type?.text ?: "()")
+
+        is MvModule -> base
+            .withTailText(this.addressRef()?.let { " ${it.text}" } ?: "")
+            .withTypeText(this.containingFile?.name)
+
+        is MvStruct -> {
+            val tailText = if (context.structAsType) "" else " { ... }"
+            base
+                .withTailText(tailText)
+                .withTypeText(this.containingFile?.name)
+        }
+
+        is MvStructField -> {
+            val fieldTy = this.type?.loweredType(msl)?.substitute(subst) ?: TyUnknown
+            base
+                .withTypeText(fieldTy.text(false))
+        }
+        is MvConst -> {
+            val constTy = this.type?.loweredType(msl) ?: TyUnknown
+            base
+                .withTypeText(constTy.text(true))
+        }
+
+        is MvBindingPat -> {
+            val bindingInference = this.inference(msl)
+            // race condition sometimes happens, when file is too big, inference is not finished yet
+            val ty = bindingInference?.getPatTypeOrUnknown(this) ?: TyUnknown
+            base
+                .withTypeText(ty.text(true))
+        }
+
+        is MvSchema -> base
+            .withTypeText(this.containingFile?.name)
+
+        else -> base
+    }
+}
+
diff --git a/src/main/kotlin/org/move/lang/core/completion/MvLookupElement.kt b/src/main/kotlin/org/move/lang/core/completion/MvLookupElement.kt
index 28188a662..a594b24f9 100644
--- a/src/main/kotlin/org/move/lang/core/completion/MvLookupElement.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/MvLookupElement.kt
@@ -60,7 +60,7 @@ fun getLookupElementProperties(
     var props = LookupElementProperties()
     val expectedTy = context.expectedTy
     if (expectedTy != null) {
-        val msl = context.isMsl()
+        val msl = context.msl
         val declaredTy =
             when (element) {
                 is MvFunctionLike -> element.declaredType(msl).retType
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/FQModuleCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/FQModuleCompletionProvider.kt
index e3144266f..22d3b4dd2 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/FQModuleCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/FQModuleCompletionProvider.kt
@@ -1,57 +1,39 @@
 package org.move.lang.core.completion.providers
 
-import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionResultSet
-import com.intellij.patterns.ElementPattern
-import com.intellij.patterns.PlatformPatterns
-import com.intellij.psi.PsiElement
-import com.intellij.util.ProcessingContext
-import org.move.lang.core.completion.CompletionContext
-import org.move.lang.core.completion.createLookupElement
-import org.move.lang.core.psi.MvFQModuleRef
-import org.move.lang.core.psi.refItemScopes
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.letStmtScope
-import org.move.lang.core.resolve.processFQModuleRef
-import org.move.lang.core.types.Address
-import org.move.lang.core.types.address
-import org.move.lang.core.withParent
-import org.move.lang.moveProject
-
-object FQModuleCompletionProvider: MvCompletionProvider() {
-    override val elementPattern: ElementPattern<out PsiElement>
-        get() =
-            PlatformPatterns.psiElement()
-                .withParent<MvFQModuleRef>()
-
-    override fun addCompletions(
-        parameters: CompletionParameters,
-        context: ProcessingContext,
-        result: CompletionResultSet,
-    ) {
-        val directParent = parameters.position.parent
-        val fqModuleRef =
-            directParent as? MvFQModuleRef
-                ?: directParent.parent as MvFQModuleRef
-        if (parameters.position !== fqModuleRef.referenceNameElement) return
-
-        val contextScopeInfo = ContextScopeInfo(
-            letStmtScope = fqModuleRef.letStmtScope,
-            refItemScopes = fqModuleRef.refItemScopes,
-        )
-        val completionContext = CompletionContext(fqModuleRef, contextScopeInfo)
-
-        val moveProj = fqModuleRef.moveProject
-        val positionAddress = fqModuleRef.addressRef.address(moveProj)
-
-        processFQModuleRef(fqModuleRef) {
-            val module = it.element
-            val moduleAddress = module.address(moveProj)
-            if (Address.eq(positionAddress, moduleAddress)) {
-                val lookup = module.createLookupElement(completionContext)
-                result.addElement(lookup)
-            }
-            false
-        }
-    }
-}
+//object FQModuleCompletionProvider: MvCompletionProvider() {
+//    override val elementPattern: ElementPattern<out PsiElement>
+//        get() =
+//            PlatformPatterns.psiElement()
+//                .withParent<MvFQModuleRef>()
+//
+//    override fun addCompletions(
+//        parameters: CompletionParameters,
+//        context: ProcessingContext,
+//        result: CompletionResultSet,
+//    ) {
+//        val directParent = parameters.position.parent
+//        val fqModuleRef =
+//            directParent as? MvFQModuleRef
+//                ?: directParent.parent as MvFQModuleRef
+//        if (parameters.position !== fqModuleRef.referenceNameElement) return
+//
+//        val contextScopeInfo = ContextScopeInfo(
+//            letStmtScope = fqModuleRef.letStmtScope,
+//            refItemScopes = fqModuleRef.refItemScopes,
+//        )
+//        val completionContext = CompletionContext(fqModuleRef, contextScopeInfo)
+//
+//        val moveProj = fqModuleRef.moveProject
+//        val positionAddress = fqModuleRef.addressRef.address(moveProj)
+//
+//        processFQModuleRef(fqModuleRef) {
+//            val module = it.element
+//            val moduleAddress = module.address(moveProj)
+//            if (Address.eq(positionAddress, moduleAddress)) {
+//                val lookup = module.createLookupElement(completionContext)
+//                result.addElement(lookup)
+//            }
+//            false
+//        }
+//    }
+//}
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/ImportsCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/ImportsCompletionProvider.kt
index a71efc7a9..872455647 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/ImportsCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/ImportsCompletionProvider.kt
@@ -1,72 +1,48 @@
 package org.move.lang.core.completion.providers
 
-import com.intellij.codeInsight.completion.BasicInsertHandler
-import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionResultSet
-import com.intellij.patterns.ElementPattern
-import com.intellij.patterns.PlatformPatterns
-import com.intellij.psi.PsiElement
-import com.intellij.util.ProcessingContext
-import org.move.lang.core.completion.CompletionContext
-import org.move.lang.core.completion.createLookupElement
-import org.move.lang.core.completion.createSelfLookup
-import org.move.lang.core.psi.MvModule
-import org.move.lang.core.psi.MvUseItem
-import org.move.lang.core.psi.MvUseItemGroup
-import org.move.lang.core.psi.ext.isSelfModuleRef
-import org.move.lang.core.psi.ext.itemUseSpeck
-import org.move.lang.core.psi.ext.names
-import org.move.lang.core.psi.refItemScopes
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.letStmtScope
-import org.move.lang.core.resolve.processModuleItems
-import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
-import org.move.lang.core.withParent
-
-object ImportsCompletionProvider: MvCompletionProvider() {
-    override val elementPattern: ElementPattern<PsiElement>
-        get() = PlatformPatterns
-            .psiElement().withParent<MvUseItem>()
-
-    override fun addCompletions(
-        parameters: CompletionParameters,
-        context: ProcessingContext,
-        result: CompletionResultSet
-    ) {
-        val itemImport = parameters.position.parent as MvUseItem
-        if (parameters.position !== itemImport.referenceNameElement) return
-
-        val moduleRef = itemImport.itemUseSpeck.fqModuleRef
-        val referredModule = moduleRef.reference?.resolve() as? MvModule
-            ?: return
-
-        val p = itemImport.parent
-        if (p is MvUseItemGroup && "Self" !in p.names) {
-            result.addElement(referredModule.createSelfLookup())
-        }
-
-        val vs = when {
-            moduleRef.isSelfModuleRef -> setOf(Visibility.Internal)
-            else -> Visibility.visibilityScopesForElement(itemImport)
-        }
-        val ns = setOf(Namespace.NAME, Namespace.TYPE, Namespace.FUNCTION)
-        val contextScopeInfo =
-            ContextScopeInfo(
-                letStmtScope = itemImport.letStmtScope,
-                refItemScopes = itemImport.refItemScopes,
-            )
-
-        val completionContext = CompletionContext(itemImport, contextScopeInfo)
-        processModuleItems(referredModule, ns, vs, contextScopeInfo) {
-            result.addElement(
-                it.element.createLookupElement(
-                    completionContext,
-                    insertHandler = BasicInsertHandler(),
-                    structAsType = true
-                )
-            )
-            false
-        }
-    }
-}
+//object ImportsCompletionProvider: MvCompletionProvider() {
+//    override val elementPattern: ElementPattern<PsiElement>
+//        get() = PlatformPatterns
+//            .psiElement().withParent<MvUseItem>()
+//
+//    override fun addCompletions(
+//        parameters: CompletionParameters,
+//        context: ProcessingContext,
+//        result: CompletionResultSet
+//    ) {
+//        val itemImport = parameters.position.parent as MvUseItem
+//        if (parameters.position !== itemImport.referenceNameElement) return
+//
+//        val moduleRef = itemImport.itemUseSpeck.fqModuleRef
+//        val referredModule = moduleRef.reference?.resolve() as? MvModule
+//            ?: return
+//
+//        val p = itemImport.parent
+//        if (p is MvUseItemGroup && "Self" !in p.names) {
+//            result.addElement(referredModule.createSelfLookup())
+//        }
+//
+//        val vs = when {
+//            moduleRef.isSelfModuleRef -> setOf(Visibility.Internal)
+//            else -> Visibility.visibilityScopesForElement(itemImport)
+//        }
+//        val ns = setOf(Namespace.NAME, Namespace.TYPE, Namespace.FUNCTION)
+//        val contextScopeInfo =
+//            ContextScopeInfo(
+//                letStmtScope = itemImport.letStmtScope,
+//                refItemScopes = itemImport.refItemScopes,
+//            )
+//
+//        val completionContext = CompletionContext(itemImport, contextScopeInfo)
+//        processModuleItems(referredModule, ns, vs, contextScopeInfo) {
+//            result.addElement(
+//                it.element.createLookupElement(
+//                    completionContext,
+//                    insertHandler = BasicInsertHandler(),
+//                    structAsType = true
+//                )
+//            )
+//            false
+//        }
+//    }
+//}
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/MethodOrFieldCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/MethodOrFieldCompletionProvider.kt
index de732feb9..de5c37753 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/MethodOrFieldCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/MethodOrFieldCompletionProvider.kt
@@ -9,11 +9,14 @@ import com.intellij.util.ProcessingContext
 import org.jetbrains.annotations.VisibleForTesting
 import org.move.lang.core.completion.CompletionContext
 import org.move.lang.core.completion.createLookupElement
-import org.move.lang.core.psi.ext.*
-import org.move.lang.core.psi.refItemScopes
+import org.move.lang.core.psi.MvFunction
+import org.move.lang.core.psi.ext.MvMethodOrField
+import org.move.lang.core.psi.ext.getFieldVariants
+import org.move.lang.core.psi.ext.inferReceiverTy
+import org.move.lang.core.psi.ext.isMsl
 import org.move.lang.core.psi.tyInfers
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.letStmtScope
+import org.move.lang.core.resolve.createProcessor
+import org.move.lang.core.resolve2.processMethodResolveVariants
 import org.move.lang.core.types.infer.InferenceContext
 import org.move.lang.core.types.infer.substitute
 import org.move.lang.core.types.ty.TyFunction
@@ -44,13 +47,14 @@ object MethodOrFieldCompletionProvider: MvCompletionProvider() {
     fun addMethodOrFieldVariants(element: MvMethodOrField, result: CompletionResultSet) {
         val msl = element.isMsl()
         val receiverTy = element.inferReceiverTy(msl).knownOrNull() ?: return
-        val scopeInfo = ContextScopeInfo(
-            letStmtScope = element.letStmtScope,
-            refItemScopes = element.refItemScopes,
-        )
+//        val scopeInfo = ContextScopeInfo(
+//            letStmtScope = element.letStmtScope,
+//            refItemScopes = element.refItemScopes,
+//        )
         val expectedTy = getExpectedTypeForEnclosingPathOrDotExpr(element, msl)
 
-        val ctx = CompletionContext(element, scopeInfo, expectedTy)
+        val ctx = CompletionContext(element, msl, expectedTy)
+//        val ctx = CompletionContext(element, scopeInfo, msl, expectedTy)
 
         val structTy = receiverTy.derefIfNeeded() as? TyStruct
         if (structTy != null) {
@@ -63,23 +67,26 @@ object MethodOrFieldCompletionProvider: MvCompletionProvider() {
                     result.addElement(lookupElement)
                 }
         }
-        getMethodVariants(element, receiverTy, msl)
-            .forEach { (_, function) ->
-                val subst = function.tyInfers
-                val declaredFuncTy = function.declaredType(msl).substitute(subst) as TyFunction
-                val declaredSelfTy = declaredFuncTy.paramTypes.first()
-                val autoborrowedReceiverTy =
-                    TyReference.autoborrow(receiverTy, declaredSelfTy)
-                        ?: error("unreachable, references always compatible")
 
-                val inferenceCtx = InferenceContext(msl)
-                inferenceCtx.combineTypes(declaredSelfTy, autoborrowedReceiverTy)
+        processMethodResolveVariants(element, receiverTy, ctx.msl, createProcessor { e ->
+            val function = e.element as? MvFunction ?: return@createProcessor
+            val subst = function.tyInfers
+            val declaredFuncTy = function.declaredType(msl).substitute(subst) as TyFunction
+            val declaredSelfTy = declaredFuncTy.paramTypes.first()
+            val autoborrowedReceiverTy =
+                TyReference.autoborrow(receiverTy, declaredSelfTy)
+                    ?: error("unreachable, references always compatible")
 
-                val lookupElement = function.createLookupElement(
+            val inferenceCtx = InferenceContext(msl)
+            inferenceCtx.combineTypes(declaredSelfTy, autoborrowedReceiverTy)
+
+            result.addElement(
+                createLookupElement(
+                    e,
                     ctx,
                     subst = inferenceCtx.resolveTypeVarsIfPossible(subst)
                 )
-                result.addElement(lookupElement)
-            }
+            )
+        })
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/ModulesCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/ModulesCompletionProvider.kt
index 991cbcd23..24599d4dc 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/ModulesCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/ModulesCompletionProvider.kt
@@ -1,87 +1,65 @@
 package org.move.lang.core.completion.providers
 
-import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionResultSet
-import com.intellij.patterns.ElementPattern
-import com.intellij.psi.PsiElement
-import com.intellij.util.ProcessingContext
-import org.move.ide.inspections.imports.ImportContext
-import org.move.lang.core.MvPsiPatterns
-import org.move.lang.core.completion.CompletionContext
-import org.move.lang.core.completion.IMPORTED_MODULE_PRIORITY
-import org.move.lang.core.completion.UNIMPORTED_ITEM_PRIORITY
-import org.move.lang.core.completion.createLookupElement
-import org.move.lang.core.psi.MvPath
-import org.move.lang.core.psi.containingModule
-import org.move.lang.core.psi.containingModuleSpec
-import org.move.lang.core.psi.ext.equalsTo
-import org.move.lang.core.psi.refItemScopes
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.letStmtScope
-import org.move.lang.core.resolve.processItems
-import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
-
-object ModulesCompletionProvider: MvCompletionProvider() {
-    override val elementPattern: ElementPattern<PsiElement>
-        get() =
-            MvPsiPatterns.path()
-
-    override fun addCompletions(
-        parameters: CompletionParameters,
-        context: ProcessingContext,
-        result: CompletionResultSet,
-    ) {
-        val maybePath = parameters.position.parent
-        val refElement =
-            maybePath as? MvPath ?: maybePath.parent as MvPath
-
-        if (parameters.position !== refElement.referenceNameElement) return
-        if (refElement.moduleRef != null) return
-
-        val processedNames = mutableSetOf<String>()
-        val namespaces = setOf(Namespace.MODULE)
-        val contextScopeInfo =
-            ContextScopeInfo(
-                letStmtScope = refElement.letStmtScope,
-                refItemScopes = refElement.refItemScopes,
-            )
-        val completionCtx = CompletionContext(refElement, contextScopeInfo)
-        processItems(refElement, namespaces, contextScopeInfo) { (name, element) ->
-            result.addElement(
-                element.createLookupElement(completionCtx, priority = IMPORTED_MODULE_PRIORITY)
-            )
-            processedNames.add(name)
-            false
-        }
-
-        // disable auto-import in module specs for now
-        if (refElement.containingModuleSpec != null) return
-
-        val path = parameters.originalPosition?.parent as? MvPath ?: return
-        val importContext =
-            ImportContext.from(
-                path,
-                namespaces,
-                setOf(Visibility.Public),
-                contextScopeInfo
-            )
-        val containingMod = path.containingModule
-        val candidates = getImportCandidates(parameters, result, processedNames, importContext,
-                                             itemFilter = {
-                                                 containingMod != null && !it.equalsTo(
-                                                     containingMod
-                                                 )
-                                             })
-        candidates.forEach { candidate ->
-            val lookupElement =
-                candidate.element.createLookupElement(
-                    completionCtx,
-                    structAsType = Namespace.TYPE in importContext.namespaces,
-                    priority = UNIMPORTED_ITEM_PRIORITY,
-                    insertHandler = ImportInsertHandler(parameters, candidate)
-                )
-            result.addElement(lookupElement)
-        }
-    }
-}
+//object ModulesCompletionProvider2: MvCompletionProvider() {
+//    override val elementPattern: ElementPattern<PsiElement>
+//        get() =
+//            MvPsiPatterns.path()
+//
+//    override fun addCompletions(
+//        parameters: CompletionParameters,
+//        context: ProcessingContext,
+//        result: CompletionResultSet,
+//    ) {
+//        val maybePath = parameters.position.parent
+//        val refElement =
+//            maybePath as? MvPath ?: maybePath.parent as MvPath
+//
+//        if (parameters.position !== refElement.referenceNameElement) return
+//        if (refElement.moduleRef != null) return
+//
+//        val processedNames = mutableSetOf<String>()
+//        val namespaces = setOf(Namespace.MODULE)
+//        val contextScopeInfo =
+//            ContextScopeInfo(
+//                letStmtScope = refElement.letStmtScope,
+//                refItemScopes = refElement.refItemScopes,
+//            )
+//        val completionCtx = CompletionContext(refElement, contextScopeInfo)
+//        processItems(refElement, namespaces, contextScopeInfo) { (name, element) ->
+//            result.addElement(
+//                element.createLookupElement(completionCtx, priority = IMPORTED_MODULE_PRIORITY)
+//            )
+//            processedNames.add(name)
+//            false
+//        }
+//
+//        // disable auto-import in module specs for now
+//        if (refElement.containingModuleSpec != null) return
+//
+//        val path = parameters.originalPosition?.parent as? MvPath ?: return
+//        val importContext =
+//            ImportContext.from(
+//                path,
+//                namespaces,
+//                setOf(Visibility.Public),
+//                contextScopeInfo
+//            )
+//        val containingMod = path.containingModule
+//        val candidates = getCompletionCandidates(parameters, result.prefixMatcher, processedNames, importContext,
+//                                                 itemFilter = {
+//                                                 containingMod != null && !it.equalsTo(
+//                                                     containingMod
+//                                                 )
+//                                             })
+//        candidates.forEach { candidate ->
+//            val lookupElement =
+//                candidate.element.createLookupElement(
+//                    completionCtx,
+//                    structAsType = Namespace.TYPE in importContext.ns,
+//                    priority = UNIMPORTED_ITEM_PRIORITY,
+//                    insertHandler = ImportInsertHandler(parameters, candidate)
+//                )
+//            result.addElement(lookupElement)
+//        }
+//    }
+//}
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/MvCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/MvCompletionProvider.kt
index e012e77c4..a4d94bf6d 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/MvCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/MvCompletionProvider.kt
@@ -2,51 +2,24 @@ package org.move.lang.core.completion.providers
 
 import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.completion.CompletionProvider
-import com.intellij.codeInsight.completion.CompletionResultSet
 import com.intellij.codeInsight.completion.InsertionContext
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.patterns.ElementPattern
 import com.intellij.psi.PsiElement
-import org.move.ide.inspections.imports.ImportContext
 import org.move.ide.utils.imports.ImportCandidate
-import org.move.ide.utils.imports.ImportCandidateCollector
 import org.move.ide.utils.imports.import
 import org.move.lang.core.completion.DefaultInsertHandler
 import org.move.lang.core.completion.getElementOfType
 import org.move.lang.core.psi.MvElement
-import org.move.lang.index.MvNamedElementIndex
 
-abstract class MvCompletionProvider : CompletionProvider<CompletionParameters>() {
+abstract class MvCompletionProvider: CompletionProvider<CompletionParameters>() {
     abstract val elementPattern: ElementPattern<out PsiElement>
-
-    protected fun getImportCandidates(
-        parameters: CompletionParameters,
-        result: CompletionResultSet,
-        processedPathNames: Set<String>,
-        importContext: ImportContext,
-        itemFilter: (PsiElement) -> Boolean = { true }
-    ): List<ImportCandidate> {
-        val project = parameters.position.project
-        val keys = hashSetOf<String>().apply {
-            val names = MvNamedElementIndex.getAllKeys(project)
-            addAll(names)
-            removeAll(processedPathNames)
-        }
-
-        return result.prefixMatcher.sortMatching(keys)
-            .flatMap {
-                ImportCandidateCollector
-                    .getImportCandidates(importContext, it)
-                    .distinctBy { it.element }
-                    .filter { itemFilter(it.element) }
-            }
-    }
 }
 
 class ImportInsertHandler(
     val parameters: CompletionParameters,
     private val candidate: ImportCandidate
-) : DefaultInsertHandler() {
+): DefaultInsertHandler() {
 
     override fun handleInsert(element: MvElement, context: InsertionContext, item: LookupElement) {
         super.handleInsert(element, context, item)
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider.kt
index 35dd00cb6..0dc7f4228 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider.kt
@@ -1,207 +1,213 @@
 package org.move.lang.core.completion.providers
 
-import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.CompletionResultSet
-import com.intellij.patterns.ElementPattern
-import com.intellij.patterns.StandardPatterns
-import com.intellij.psi.PsiElement
-import com.intellij.util.ProcessingContext
-import org.move.ide.inspections.imports.ImportContext
-import org.move.lang.core.MvPsiPatterns
-import org.move.lang.core.completion.CompletionContext
-import org.move.lang.core.completion.UNIMPORTED_ITEM_PRIORITY
-import org.move.lang.core.completion.createLookupElement
-import org.move.lang.core.psi.*
-import org.move.lang.core.psi.ext.ancestors
-import org.move.lang.core.psi.ext.endOffset
-import org.move.lang.core.psi.ext.isMslScope
-import org.move.lang.core.psi.ext.isSelfModuleRef
-import org.move.lang.core.resolve.*
-import org.move.lang.core.resolve.ref.MvReferenceElement
-import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
-import org.move.lang.core.types.infer.inferExpectedTy
-import org.move.lang.core.types.infer.inference
-import org.move.lang.core.types.ty.Ty
-import org.move.lang.core.types.ty.TyUnknown
-
-abstract class MvPathCompletionProvider: MvCompletionProvider() {
-
-    abstract val namespace: Namespace
-
-    open fun pathScopeInfo(pathElement: MvPath): ContextScopeInfo =
-        ContextScopeInfo(
-            letStmtScope = pathElement.letStmtScope,
-            refItemScopes = pathElement.refItemScopes,
-        )
-
-    final override fun addCompletions(
-        parameters: CompletionParameters,
-        context: ProcessingContext,
-        result: CompletionResultSet
-    ) {
-        val maybePath = parameters.position.parent
-        val pathElement = maybePath as? MvPath ?: maybePath.parent as MvPath
-
-        if (parameters.position !== pathElement.referenceNameElement) return
-
-        val moduleRef = pathElement.moduleRef
-        val namespaces = setOf(this.namespace)
-        val pathScopeInfo = pathScopeInfo(pathElement)
-        val msl = pathElement.isMslScope
-        val expectedTy = getExpectedTypeForEnclosingPathOrDotExpr(pathElement, msl)
-
-        val structAsType = this.namespace == Namespace.TYPE
-        val ctx = CompletionContext(
-            pathElement,
-            pathScopeInfo,
-            expectedTy
-        )
-
-        if (moduleRef != null) {
-            val module = moduleRef.reference?.resolveWithAliases() as? MvModule
-                ?: return
-            val vs = when {
-                moduleRef.isSelfModuleRef -> setOf(Visibility.Internal)
-                else -> Visibility.visibilityScopesForElement(pathElement)
-            }
-            processModuleItems(module, namespaces, vs, pathScopeInfo) {
-                val lookup =
-                    it.element.createLookupElement(ctx, structAsType = structAsType)
-                result.addElement(lookup)
-                false
-            }
-            return
-        }
-
-        val processedNames = mutableSetOf<String>()
-        processItems(pathElement, namespaces, pathScopeInfo) { (name, element) ->
-            if (processedNames.contains(name)) {
-                return@processItems false
-            }
-            processedNames.add(name)
-            result.addElement(
-                element.createLookupElement(
-                    ctx,
-                    structAsType = structAsType,
-                    priority = element.completionPriority
-                )
-            )
-            false
-        }
-
-        // disable auto-import in module specs for now
-        if (pathElement.containingModuleSpec != null) return
-
-        val originalPathElement = parameters.originalPosition?.parent as? MvPath ?: return
-        val importContext =
-            ImportContext.from(
-                originalPathElement,
-                namespaces,
-                setOf(Visibility.Public),
-                pathScopeInfo
-            )
-        val candidates = getImportCandidates(
-            parameters,
-            result,
-            processedNames,
-            importContext,
-        )
-        candidates.forEach { candidate ->
-            val lookupElement = candidate.element.createLookupElement(
-                ctx,
-                structAsType = structAsType,
-                priority = UNIMPORTED_ITEM_PRIORITY,
-                insertHandler = ImportInsertHandler(parameters, candidate)
-            )
-            result.addElement(lookupElement)
-        }
-    }
-}
-
-object NamesCompletionProvider: MvPathCompletionProvider() {
-    override val elementPattern: ElementPattern<PsiElement>
-        get() =
-            MvPsiPatterns.path()
-                .andNot(MvPsiPatterns.pathType())
-                .andNot(MvPsiPatterns.schemaLit())
-
-    override val namespace: Namespace get() = Namespace.NAME
-
-//    override fun itemVis(pathElement: MvPath): ItemVis {
-//        return ItemVis(
-//            setOf(Namespace.NAME),
-//            Visibility.none(),
-//            mslLetScope = pathElement.mslLetScope,
-//            itemScopes = pathElement.itemScopes,
+//fun interface CompletionFilter {
+//    fun removeEntry(entry: ScopeEntry, ctx: PathResolutionContext): Boolean
+//}
+
+//abstract class MvPathCompletionProvider: MvCompletionProvider() {
+//
+//    abstract val namespaces: Set<Namespace>
+//
+//    open val completionFilters: List<CompletionFilter> = emptyList()
+//
+//    open fun pathScopeInfo(pathElement: MvPath): ContextScopeInfo =
+//        ContextScopeInfo(
+//            letStmtScope = pathElement.letStmtScope,
+//            refItemScopes = pathElement.refItemScopes,
 //        )
-//    }
-}
-
-object FunctionsCompletionProvider: MvPathCompletionProvider() {
-    override val elementPattern: ElementPattern<PsiElement>
-        get() =
-            MvPsiPatterns.path()
-                .andNot(MvPsiPatterns.pathType())
-                .andNot(MvPsiPatterns.schemaLit())
-
-    override val namespace: Namespace get() = Namespace.FUNCTION
-
-//    override fun itemVis(pathElement: MvPath): ItemVis {
-//        return ItemVis(
-//            setOf(Namespace.FUNCTION),
-//            Visibility.none(),
-//            mslLetScope = pathElement.mslLetScope,
-//            itemScopes = pathElement.itemScopes,
+//
+//    final override fun addCompletions(
+//        parameters: CompletionParameters,
+//        context: ProcessingContext,
+//        result: CompletionResultSet
+//    ) {
+//        val maybePath = parameters.position.parent
+//        val pathElement = maybePath as? MvPath ?: maybePath.parent as MvPath
+//
+//        if (parameters.position !== pathElement.referenceNameElement) return
+//
+//        val qualifier = pathElement.qualifier
+//
+//        val contextScopeInfo = pathScopeInfo(pathElement)
+//        val msl = pathElement.isMslScope
+//        val expectedTy = getExpectedTypeForEnclosingPathOrDotExpr(pathElement, msl)
+//        val structAsType = Namespace.TYPE in this.namespaces
+//
+//        val completionContext = CompletionContext(
+//            pathElement,
+//            contextScopeInfo,
+//            expectedTy,
+//        )
+//
+//        var completionCollector = createProcessor { e ->
+//            val element = e.element as? MvNamedElement ?: return@createProcessor
+//            val lookup =
+//                element.createLookupElement(
+//                    completionContext,
+//                    structAsType = structAsType,
+//                    priority = element.completionPriority
+//                )
+//            result.addElement(lookup)
+//        }
+//
+//        if (qualifier != null) {
+//            val resolvedQualifier = qualifier.reference?.resolveFollowingAliases()
+//            when (resolvedQualifier) {
+//                is MvModule -> {
+//                    val moduleBlock = resolvedQualifier.moduleBlock
+//                    if (moduleBlock != null) {
+//                        processItemDeclarations(moduleBlock, this.namespaces, completionCollector)
+//                    }
+//                }
+//            }
+//            return
+//        }
+//
+////        if (moduleRef != null) {
+////            val module = moduleRef.reference?.resolveWithAliases() as? MvModule
+////                ?: return
+////            val vs = when {
+////                moduleRef.isSelfModuleRef -> setOf(Visibility.Internal)
+////                else -> Visibility.visibilityScopesForElement(pathElement)
+////            }
+////            processModuleItems(module, namespaces, vs, contextScopeInfo) {
+////                val lookup =
+////                    it.element.createLookupElement(ctx, structAsType = structAsType)
+////                result.addElement(lookup)
+////                false
+////            }
+////            return
+////        }
+//
+//        val processedNames = mutableSetOf<String>()
+//        completionCollector = completionCollector.wrapWithFilter { e ->
+//            if (processedNames.contains(e.name)) {
+//                return@wrapWithFilter false
+//            }
+//            processedNames.add(e.name)
+//            true
+//        }
+//
+//        val resolutionCtx = PathResolutionContext(pathElement, contextScopeInfo)
+//
+//        // custom filters
+//        completionCollector = completionCollector.wrapWithFilter {
+//            for (completionFilter in this.completionFilters) {
+//                if (!completionFilter.removeEntry(it, resolutionCtx)) return@wrapWithFilter false
+//            }
+//            true
+//        }
+//
+//        val ctx = PathResolutionContext(pathElement, contextScopeInfo)
+//        processNestedScopesUpwards(pathElement, this.namespaces, ctx, completionCollector)
+//
+////        processItems(pathElement, namespaces, contextScopeInfo) { (name, element) ->
+////            if (processedNames.contains(name)) {
+////                return@processItems false
+////            }
+////            processedNames.add(name)
+////            result.addElement(
+////                element.createLookupElement(
+////                    completionContext,
+////                    structAsType = structAsType,
+////                    priority = element.completionPriority
+////                )
+////            )
+////            false
+////        }
+//
+//        // disable auto-import in module specs for now
+//        if (pathElement.containingModuleSpec != null) return
+//
+//        val originalPathElement = parameters.originalPosition?.parent as? MvPath ?: return
+//        val importContext =
+//            ImportContext.from(
+//                originalPathElement,
+//                this.namespaces,
+//                setOf(Visibility.Public),
+//                contextScopeInfo
+//            )
+//        val candidates = getCompletionCandidates(
+//            parameters,
+//            result.prefixMatcher,
+//            processedNames,
+//            importContext,
 //        )
+//        candidates.forEach { candidate ->
+//            val entry = SimpleScopeEntry(candidate.qualName.itemName, candidate.element, namespaces)
+//            for (completionFilter in completionFilters) {
+//                if (!completionFilter.removeEntry(entry, resolutionCtx)) return@forEach
+//            }
+//            val lookupElement = candidate.element.createLookupElement(
+//                completionContext,
+//                structAsType = structAsType,
+//                priority = UNIMPORTED_ITEM_PRIORITY,
+//                insertHandler = ImportInsertHandler(parameters, candidate)
+//            )
+//            result.addElement(lookupElement)
+//        }
 //    }
-}
-
-object TypesCompletionProvider: MvPathCompletionProvider() {
-    override val elementPattern: ElementPattern<out PsiElement>
-        get() = MvPsiPatterns.pathType()
-
-    override val namespace: Namespace get() = Namespace.TYPE
-
-//    override fun itemVis(pathElement: MvPath): ItemVis {
-//        return ItemVis(
-//            setOf(Namespace.TYPE),
-//            Visibility.none(),
-//            mslLetScope = pathElement.mslLetScope,
-//            itemScopes = pathElement.itemScopes,
+//}
+
+//object NamesCompletionProvider: MvPathCompletionProvider() {
+//    override val elementPattern: ElementPattern<PsiElement>
+//        get() =
+//            MvPsiPatterns.path()
+//                .andNot(MvPsiPatterns.pathType())
+//                .andNot(MvPsiPatterns.schemaLit())
+//
+//    override val namespaces: Set<Namespace> get() = EnumSet.of(Namespace.NAME)
+//}
+
+//object FunctionsCompletionProvider: MvPathCompletionProvider() {
+//    override val elementPattern: ElementPattern<PsiElement>
+//        get() =
+//            MvPsiPatterns.path()
+//                .andNot(MvPsiPatterns.pathType())
+//                .andNot(MvPsiPatterns.schemaLit())
+//
+//    override val namespaces: Set<Namespace> get() = EnumSet.of(Namespace.FUNCTION)
+//}
+
+//object TypesCompletionProvider: MvPathCompletionProvider() {
+//    override val elementPattern: ElementPattern<out PsiElement>
+//        get() = MvPsiPatterns.pathType()
+//
+//    override val namespaces: Set<Namespace> get() = EnumSet.of(Namespace.TYPE)
+//}
+
+//object SchemasCompletionProvider: MvPathCompletionProvider() {
+//    override val elementPattern: ElementPattern<PsiElement>
+//        get() =
+//            StandardPatterns.or(
+//                MvPsiPatterns.schemaLit(), MvPsiPatterns.pathInsideIncludeStmt()
+//            )
+//
+//    override val namespaces: Set<Namespace> get() = EnumSet.of(Namespace.SCHEMA)
+//
+//    override fun pathScopeInfo(pathElement: MvPath): ContextScopeInfo {
+//        return ContextScopeInfo(
+//            letStmtScope = LetStmtScope.EXPR_STMT,
+//            refItemScopes = pathElement.refItemScopes,
 //        )
 //    }
-}
-
-object SchemasCompletionProvider: MvPathCompletionProvider() {
-    override val elementPattern: ElementPattern<PsiElement>
-        get() =
-            StandardPatterns.or(
-                MvPsiPatterns.schemaLit(), MvPsiPatterns.pathInsideIncludeStmt()
-            )
-
-    override val namespace: Namespace get() = Namespace.SCHEMA
-
-    override fun pathScopeInfo(pathElement: MvPath): ContextScopeInfo {
-        return ContextScopeInfo(
-            letStmtScope = LetStmtScope.EXPR_STMT,
-            refItemScopes = pathElement.refItemScopes,
-        )
-    }
-}
-
-fun getExpectedTypeForEnclosingPathOrDotExpr(element: MvReferenceElement, msl: Boolean): Ty? {
-    for (ancestor in element.ancestors) {
-        if (element.endOffset < ancestor.endOffset) continue
-        if (element.endOffset > ancestor.endOffset) break
-        when (ancestor) {
-            is MvPathType,
-            is MvRefExpr,
-            is MvDotExpr -> {
-                val inference = (ancestor as MvElement).inference(msl) ?: return TyUnknown
-                return inferExpectedTy(ancestor, inference)
-            }
-        }
-    }
-    return null
-}
+//}
+
+//object ModulesCompletionProvider: MvPathCompletionProvider() {
+//    override val elementPattern: ElementPattern<PsiElement>
+//        get() =
+//            MvPsiPatterns.path()
+//                .andNot(MvPsiPatterns.pathType())
+//                .andNot(MvPsiPatterns.schemaLit())
+//
+//    override val namespaces: Set<Namespace> get() = EnumSet.of(Namespace.MODULE)
+//
+//    override val completionFilters: List<CompletionFilter>
+//        get() = listOf(
+//            // filter out the current module
+//            CompletionFilter { e, ctx ->
+//                if (e.element is MvModule)
+//                    return@CompletionFilter ctx.containingModule?.let { e.element.equalsTo(it) } ?: true
+//                true
+//            })
+//}
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider2.kt b/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider2.kt
new file mode 100644
index 000000000..5e615c097
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/MvPathCompletionProvider2.kt
@@ -0,0 +1,181 @@
+package org.move.lang.core.completion.providers
+
+import com.intellij.codeInsight.completion.CompletionParameters
+import com.intellij.codeInsight.completion.CompletionResultSet
+import com.intellij.patterns.ElementPattern
+import com.intellij.psi.PsiElement
+import com.intellij.util.ProcessingContext
+import org.move.ide.inspections.imports.ImportContext
+import org.move.ide.utils.imports.ImportCandidateCollector
+import org.move.lang.core.MvPsiPatterns.path
+import org.move.lang.core.completion.CompletionContext
+import org.move.lang.core.completion.UNIMPORTED_ITEM_PRIORITY
+import org.move.lang.core.completion.createLookupElement
+import org.move.lang.core.completion.getOriginalOrSelf
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.ext.*
+import org.move.lang.core.resolve.*
+import org.move.lang.core.resolve.ref.MvReferenceElement
+import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.resolve.ref.Namespace.*
+import org.move.lang.core.resolve2.PathKind
+import org.move.lang.core.resolve2.pathKind
+import org.move.lang.core.resolve2.ref.ResolutionContext
+import org.move.lang.core.resolve2.ref.processPathResolveVariants
+import org.move.lang.core.types.infer.inferExpectedTy
+import org.move.lang.core.types.infer.inference
+import org.move.lang.core.types.ty.Ty
+import org.move.lang.core.types.ty.TyUnknown
+
+fun interface CompletionFilter {
+    fun removeEntry(entry: ScopeEntry, ctx: ResolutionContext): Boolean
+}
+
+object MvPathCompletionProvider2: MvCompletionProvider() {
+    override val elementPattern: ElementPattern<out PsiElement> get() = path()
+
+    override fun addCompletions(
+        parameters: CompletionParameters,
+        context: ProcessingContext,
+        result: CompletionResultSet
+    ) {
+        val maybePath = parameters.position.parent
+        val pathElement = maybePath as? MvPath ?: maybePath.parent as MvPath
+        if (parameters.position !== pathElement.referenceNameElement) return
+
+        val parentElement = pathElement.rootPath().parent
+        val resolutionCtx = ResolutionContext(pathElement, isCompletion = true)
+        val msl = pathElement.isMslScope
+        val expectedTy = getExpectedTypeForEnclosingPathOrDotExpr(pathElement, msl)
+
+        val useGroup = resolutionCtx.useSpeck?.parent as? MvUseGroup
+        val existingNames = useGroup?.names.orEmpty().toSet()
+        val ns = buildSet {
+            val pathKind = pathElement.pathKind()
+            if (resolutionCtx.isUseSpeck) {
+                when (pathKind) {
+                    is PathKind.QualifiedPath.Module -> add(MODULE)
+                    is PathKind.QualifiedPath -> addAll(Namespace.items())
+                    else -> {}
+                }
+            } else {
+                if (pathKind is PathKind.UnqualifiedPath) {
+                    add(MODULE)
+                }
+                when (parentElement) {
+                    is MvPathType -> add(TYPE)
+                    is MvSchemaLit -> add(SCHEMA)
+                    else -> {
+                        add(NAME)
+                        add(FUNCTION)
+                    }
+                }
+            }
+        }
+        val structAsType = TYPE in ns
+
+        val completionContext = CompletionContext(
+            pathElement,
+            msl,
+            expectedTy,
+            resolutionCtx = resolutionCtx,
+            structAsType,
+        )
+        addVariants(
+            pathElement, parameters, completionContext, ns, result,
+            CompletionFilter { e, ctx ->
+                // skip existing items, only non-empty for use groups
+                if (e.name in existingNames) return@CompletionFilter true
+
+                // drop Self completion for non-UseGroup items
+                if (e.name == "Self" && useGroup == null) return@CompletionFilter true
+
+                // filter out current module, skips processing (return true)
+                val element = e.element.getOriginalOrSelf()
+                if (element is MvModule) {
+                    val containingModule = ctx.containingModule?.getOriginalOrSelf()
+                    if (containingModule != null) {
+                        return@CompletionFilter containingModule.equalsTo(element)
+                    }
+                }
+                false
+            }
+        )
+    }
+
+    fun addVariants(
+        pathElement: MvPath,
+        parameters: CompletionParameters,
+        completionContext: CompletionContext,
+        ns: Set<Namespace>,
+        result: CompletionResultSet,
+        completionFilter: CompletionFilter? = null
+    ) {
+        val resolutionCtx = completionContext.resolutionCtx ?: error("always non-null in path completion")
+        val processedNames = mutableSetOf<String>()
+        collectCompletionVariants(result, completionContext) {
+            val processor = it
+                .wrapWithFilter { e ->
+                    // custom completion filters
+                    if (completionFilter != null) {
+                        if (completionFilter.removeEntry(e, resolutionCtx)) return@wrapWithFilter false
+                    }
+
+                    // drop already visited items
+                    if (processedNames.contains(e.name)) return@wrapWithFilter false
+                    processedNames.add(e.name)
+
+                    // drop invisible items
+                    if (!e.isVisibleFrom(pathElement)) return@wrapWithFilter false
+
+                    true
+                }
+            val pathKind = pathElement.pathKind(overwriteNs = ns)
+            processPathResolveVariants(resolutionCtx, pathKind, processor)
+        }
+
+        // disable auto-import in module specs for now
+        if (pathElement.containingModuleSpec != null) return
+
+        // no out-of-scope completions for use specks
+        if (pathElement.isUseSpeck) return
+
+        val originalPathElement = parameters.originalPosition?.parent as? MvPath ?: return
+        val importContext = ImportContext.from(originalPathElement, ns)
+        val candidates =
+            ImportCandidateCollector.getCompletionCandidates(
+                parameters,
+                result.prefixMatcher,
+                processedNames,
+                importContext,
+            )
+        candidates.forEach { candidate ->
+            val entry = SimpleScopeEntry(candidate.qualName.itemName, candidate.element, ns)
+            if (completionFilter != null) {
+                if (completionFilter.removeEntry(entry, resolutionCtx)) return@forEach
+            }
+            val lookupElement = candidate.element.createLookupElement(
+                completionContext,
+                priority = UNIMPORTED_ITEM_PRIORITY,
+                insertHandler = ImportInsertHandler(parameters, candidate)
+            )
+            result.addElement(lookupElement)
+        }
+    }
+}
+
+fun getExpectedTypeForEnclosingPathOrDotExpr(element: MvReferenceElement, msl: Boolean): Ty? {
+    for (ancestor in element.ancestors) {
+        if (element.endOffset < ancestor.endOffset) continue
+        if (element.endOffset > ancestor.endOffset) break
+        when (ancestor) {
+            is MvPathType,
+            is MvRefExpr,
+            is MvDotExpr -> {
+                val inference = (ancestor as MvElement).inference(msl) ?: return TyUnknown
+                return inferExpectedTy(ancestor, inference)
+            }
+        }
+    }
+    return null
+}
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/AddressesCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/NamedAddressInUseStmtCompletionProvider.kt
similarity index 62%
rename from src/main/kotlin/org/move/lang/core/completion/providers/AddressesCompletionProvider.kt
rename to src/main/kotlin/org/move/lang/core/completion/providers/NamedAddressInUseStmtCompletionProvider.kt
index ed5e72166..a2339234c 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/AddressesCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/NamedAddressInUseStmtCompletionProvider.kt
@@ -11,14 +11,16 @@ import com.intellij.psi.PsiElement
 import com.intellij.util.ProcessingContext
 import org.move.cli.AddressVal
 import org.move.ide.MoveIcons
+import org.move.lang.core.MvPsiPatterns
 import org.move.lang.core.completion.alreadyHasColonColon
 import org.move.lang.core.psi.MvModule
 import org.move.lang.core.psi.MvNamedAddress
+import org.move.lang.core.psi.MvUseStmt
 import org.move.lang.core.psiElement
 import org.move.lang.core.withParent
 import org.move.lang.moveProject
 
-object AddressInModuleDeclCompletionProvider : MvCompletionProvider() {
+object AddressInModuleDeclCompletionProvider: MvCompletionProvider() {
     override val elementPattern: ElementPattern<out PsiElement>
         get() = PlatformPatterns
             .psiElement()
@@ -30,8 +32,7 @@ object AddressInModuleDeclCompletionProvider : MvCompletionProvider() {
         context: ProcessingContext,
         result: CompletionResultSet
     ) {
-        val element = parameters.position
-        val moveProject = element.moveProject ?: return
+        val moveProject = parameters.position.moveProject ?: return
         val addresses = moveProject.addressValues()
         for ((name, value) in addresses.entries.sortedBy { it.key }) {
             val lookup = LookupElementBuilder
@@ -49,7 +50,7 @@ object AddressInModuleDeclCompletionProvider : MvCompletionProvider() {
     }
 }
 
-object AddressesCompletionProvider : MvCompletionProvider() {
+object NamedAddressAtValueExprCompletionProvider: MvCompletionProvider() {
     override val elementPattern: ElementPattern<out PsiElement>
         get() = PlatformPatterns
             .psiElement().withParent<MvNamedAddress>()
@@ -58,6 +59,37 @@ object AddressesCompletionProvider : MvCompletionProvider() {
                     .withSuperParent(3, psiElement<MvModule>())
             )
 
+    override fun addCompletions(
+        parameters: CompletionParameters,
+        context: ProcessingContext,
+        result: CompletionResultSet
+    ) {
+        val moveProject = parameters.position.moveProject ?: return
+        val declaredNamedAddresses = moveProject.addresses().values
+        for ((name, addressVal) in declaredNamedAddresses.entries.sortedBy { it.key }) {
+            val lookup = addressVal.createCompletionLookupElement(name)
+            result.addElement(lookup)
+        }
+    }
+}
+
+object NamedAddressInUseStmtCompletionProvider: MvCompletionProvider() {
+    override val elementPattern: ElementPattern<out PsiElement>
+        get() = MvPsiPatterns.path()
+            .and(
+                PlatformPatterns.psiElement()
+                    // use path::ident::
+                    //          ^ should not exist
+                    .andNot(
+                        PlatformPatterns.psiElement().afterLeaf("::")
+                    )
+                    // use [ident::]
+                    //           ^ path (1)
+                    //     ^ use speck (2)
+                    // ^ use stmt (3)
+                    .withSuperParent(3, psiElement<MvUseStmt>())
+            )
+
     override fun addCompletions(
         parameters: CompletionParameters,
         context: ProcessingContext,
@@ -65,8 +97,8 @@ object AddressesCompletionProvider : MvCompletionProvider() {
     ) {
         val element = parameters.position
         val moveProject = element.moveProject ?: return
-        val addresses = moveProject.addressValues()
-        for ((name, addressVal) in addresses.entries.sortedBy { it.key }) {
+        val declaredNamedAddresses = moveProject.addresses().values
+        for ((name, addressVal) in declaredNamedAddresses.entries.sortedBy { it.key }) {
             val lookup = addressVal.createCompletionLookupElement(name)
             result.addElement(lookup)
         }
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/SchemaFieldsCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/SchemaFieldsCompletionProvider.kt
index 0a397bc6f..0712d200b 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/SchemaFieldsCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/SchemaFieldsCompletionProvider.kt
@@ -7,20 +7,20 @@ import com.intellij.patterns.PlatformPatterns
 import com.intellij.psi.PsiElement
 import com.intellij.util.ProcessingContext
 import org.move.lang.core.completion.CompletionContext
-import org.move.lang.core.completion.createLookupElement
+import org.move.lang.core.completion.getOriginalOrSelf
 import org.move.lang.core.psi.MvSchemaLitField
-import org.move.lang.core.psi.ext.fieldBindings
-import org.move.lang.core.psi.ext.fieldNames
-import org.move.lang.core.psi.ext.schema
+import org.move.lang.core.psi.ext.fields
+import org.move.lang.core.psi.ext.isMsl
+import org.move.lang.core.psi.ext.processSchemaLitFieldResolveVariants
 import org.move.lang.core.psi.ext.schemaLit
-import org.move.lang.core.resolve.ContextScopeInfo
+import org.move.lang.core.resolve.collectCompletionVariants
+import org.move.lang.core.resolve.wrapWithFilter
 import org.move.lang.core.withParent
 
 object SchemaFieldsCompletionProvider: MvCompletionProvider() {
     override val elementPattern: ElementPattern<out PsiElement>
-        get() = PlatformPatterns
-            .psiElement()
-            .withParent<MvSchemaLitField>()
+        get() =
+            PlatformPatterns.psiElement().withParent<MvSchemaLitField>()
 
     override fun addCompletions(
         parameters: CompletionParameters,
@@ -28,16 +28,17 @@ object SchemaFieldsCompletionProvider: MvCompletionProvider() {
         result: CompletionResultSet
     ) {
         val pos = parameters.position
-        val element = pos.parent as? MvSchemaLitField ?: return
-        val schemaLit = element.schemaLit ?: return
-        val schema = schemaLit.schema ?: return
-        val providedFieldNames = schemaLit.fieldNames
+        val literalField = pos.parent as? MvSchemaLitField ?: return
 
-        val completionCtx = CompletionContext(element, ContextScopeInfo.msl())
-        for (fieldBinding in schema.fieldBindings.filter { it.name !in providedFieldNames }) {
-            result.addElement(
-                fieldBinding.createLookupElement(completionCtx)
-            )
+        val schemaLit = literalField.schemaLit?.getOriginalOrSelf() ?: return
+        val existingFieldNames = schemaLit.fields
+            .filter { !it.textRange.contains(pos.textOffset) }
+            .map { it.referenceName }
+
+        val completionCtx = CompletionContext(literalField, literalField.isMsl())
+        collectCompletionVariants(result, completionCtx) {
+            val processor = it.wrapWithFilter { e -> e.name !in existingFieldNames }
+            processSchemaLitFieldResolveVariants(literalField, processor)
         }
     }
 }
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/StructFieldsCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/StructFieldsCompletionProvider.kt
index 6a5ca8c68..738ecd0de 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/StructFieldsCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/StructFieldsCompletionProvider.kt
@@ -12,7 +12,6 @@ import org.move.lang.core.completion.CompletionContext
 import org.move.lang.core.completion.createLookupElement
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
-import org.move.lang.core.resolve.ContextScopeInfo
 import org.move.lang.core.withParent
 import org.move.lang.core.withSuperParent
 
@@ -39,7 +38,8 @@ object StructFieldsCompletionProvider: MvCompletionProvider() {
 
         if (element is MvBindingPat) element = element.parent as MvElement
 
-        val completionCtx = CompletionContext(element, ContextScopeInfo.default())
+        val completionCtx = CompletionContext(element, element.isMsl())
+//        val completionCtx = CompletionContext(element, ContextScopeInfo.default())
         when (element) {
             is MvStructPatField -> {
                 val structPat = element.structPat
diff --git a/src/main/kotlin/org/move/lang/core/completion/providers/StructPatCompletionProvider.kt b/src/main/kotlin/org/move/lang/core/completion/providers/StructPatCompletionProvider.kt
index de0aaf57a..6bd099935 100644
--- a/src/main/kotlin/org/move/lang/core/completion/providers/StructPatCompletionProvider.kt
+++ b/src/main/kotlin/org/move/lang/core/completion/providers/StructPatCompletionProvider.kt
@@ -7,17 +7,14 @@ import com.intellij.patterns.PlatformPatterns
 import com.intellij.psi.PsiElement
 import com.intellij.util.ProcessingContext
 import org.move.lang.core.completion.CompletionContext
-import org.move.lang.core.completion.createLookupElement
 import org.move.lang.core.psi.MvBindingPat
 import org.move.lang.core.psi.MvLetStmt
 import org.move.lang.core.psi.containingModule
-import org.move.lang.core.psi.namedItemScopes
+import org.move.lang.core.psi.ext.isMsl
 import org.move.lang.core.psiElement
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.LetStmtScope
-import org.move.lang.core.resolve.processModuleItems
+import org.move.lang.core.resolve.collectCompletionVariants
 import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
+import org.move.lang.core.resolve2.processItemDeclarations
 import org.move.lang.core.withParent
 
 object StructPatCompletionProvider: MvCompletionProvider() {
@@ -34,22 +31,13 @@ object StructPatCompletionProvider: MvCompletionProvider() {
     ) {
         val bindingPat = parameters.position.parent as MvBindingPat
         val module = bindingPat.containingModule ?: return
+        val completionCtx = CompletionContext(bindingPat, bindingPat.isMsl())
 
-        val namespaces = setOf(Namespace.TYPE)
-        val contextScopeInfo =
-            ContextScopeInfo(
-                letStmtScope = LetStmtScope.NONE,
-                refItemScopes = bindingPat.namedItemScopes,
-            )
-        val completionCtx = CompletionContext(bindingPat, contextScopeInfo)
-        processModuleItems(module, namespaces, setOf(Visibility.Internal), contextScopeInfo) {
-            val lookup =
-                it.element.createLookupElement(completionCtx)
-            result.addElement(lookup)
-            false
-
+        val moduleBlock = module.moduleBlock
+        if (moduleBlock != null) {
+            collectCompletionVariants(result, completionCtx) {
+                processItemDeclarations(moduleBlock, setOf(Namespace.TYPE), it)
+            }
         }
     }
-
-
 }
diff --git a/src/main/kotlin/org/move/lang/core/psi/MvElement.kt b/src/main/kotlin/org/move/lang/core/psi/MvElement.kt
index 7e7c4e4a8..0c32b2801 100644
--- a/src/main/kotlin/org/move/lang/core/psi/MvElement.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/MvElement.kt
@@ -37,7 +37,7 @@ val MvElement.containingModule: MvModule? get() = ancestorStrict()
 
 val MvElement.containingModuleSpec: MvModuleSpec? get() = ancestorStrict()
 
-val MvElement.containingImportsOwner get() = ancestorOrSelf<MvImportsOwner>()
+val MvElement.containingItemsOwner get() = ancestorOrSelf<MvItemsOwner>()
 
 //val MvElement.containingModuleOrScript: MvElement?
 //    get() {
diff --git a/src/main/kotlin/org/move/lang/core/psi/MvImportsOwner.kt b/src/main/kotlin/org/move/lang/core/psi/MvImportsOwner.kt
deleted file mode 100644
index 0d32486aa..000000000
--- a/src/main/kotlin/org/move/lang/core/psi/MvImportsOwner.kt
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.move.lang.core.psi
-
-import com.intellij.psi.util.CachedValuesManager.getProjectPsiDependentCache
-import org.move.lang.core.psi.ext.addressRef
-import org.move.lang.core.psi.ext.isSelf
-
-interface MvImportsOwner: MvElement {
-    val useStmtList: List<MvUseStmt>
-}
-
-fun MvImportsOwner.items(): Sequence<MvElement> {
-    return generateSequence(firstChild) { it.nextSibling }
-        .filterIsInstance<MvElement>()
-        .filter { it !is MvAttr }
-}
-
-fun MvImportsOwner.moduleUseItems(): List<MvNamedElement> =
-    listOf(
-        moduleUseSpecksNoAliases(),
-        moduleUseSpecksAliases(),
-        selfModuleUseItemNoAliases(),
-        selfModuleUseItemAliases(),
-    ).flatten()
-
-fun MvImportsOwner.moduleUseSpecksNoAliases(): List<MvModuleUseSpeck> =
-    moduleUseSpecks()
-        .filter { it.useAlias == null }
-
-fun MvImportsOwner.moduleUseSpecksAliases(): List<MvUseAlias> =
-    moduleUseSpecks().mapNotNull { it.useAlias }
-
-
-private fun MvImportsOwner.moduleUseSpecks(): List<MvModuleUseSpeck> {
-    return getProjectPsiDependentCache(this) {
-        useStmtList.mapNotNull { it.moduleUseSpeck }
-    }
-}
-
-fun MvImportsOwner.psiUseItems(): List<MvUseItem> {
-    return getProjectPsiDependentCache(this) { importsOwner ->
-        importsOwner
-            .useStmtList
-            .mapNotNull { it.itemUseSpeck }
-            .flatMap {
-                val item = it.useItem
-                if (item != null) {
-                    listOf(item)
-                } else
-                    it.useItemGroup?.useItemList.orEmpty()
-            }
-
-    }
-}
-
-fun MvImportsOwner.allUseItems(): List<MvNamedElement> =
-    listOf(
-        useItemsNoAliases(),
-        useItemsAliases(),
-    ).flatten()
-
-fun MvImportsOwner.useItemsNoAliases(): List<MvUseItem> =
-    psiUseItems()
-        .filter { !it.isSelf }
-        .filter { it.useAlias == null }
-
-fun MvImportsOwner.useItemsAliases(): List<MvUseAlias> =
-    psiUseItems()
-        .filter { !it.isSelf }
-        .mapNotNull { it.useAlias }
-
-fun MvImportsOwner.selfModuleUseItemNoAliases(): List<MvUseItem> =
-    psiUseItems()
-        .filter { it.isSelf && it.useAlias == null }
-
-fun MvImportsOwner.selfModuleUseItemAliases(): List<MvUseAlias> =
-    psiUseItems()
-        .filter { it.isSelf }
-        .mapNotNull { it.useAlias }
-
-fun MvImportsOwner.shortestPathText(item: MvNamedElement): String? {
-    val itemName = item.name ?: return null
-    // local
-    if (this == item.containingImportsOwner) return itemName
-
-    for (useItem in this.useItemsNoAliases()) {
-        val importedItem = useItem.reference.resolve() ?: continue
-        if (importedItem == item) {
-            return itemName
-        }
-    }
-    val module = item.containingModule ?: return null
-    val moduleName = module.name ?: return null
-    for (moduleImport in this.moduleUseSpecksNoAliases()) {
-        val importedModule = moduleImport.fqModuleRef?.reference?.resolve() ?: continue
-        if (importedModule == module) {
-            return "$moduleName::$itemName"
-        }
-    }
-    val addressName = module.addressRef()?.text ?: return null
-    return "$addressName::$moduleName::$itemName"
-}
diff --git a/src/main/kotlin/org/move/lang/core/psi/MvPsiFactory.kt b/src/main/kotlin/org/move/lang/core/psi/MvPsiFactory.kt
index e3df70df8..acf5b8d59 100644
--- a/src/main/kotlin/org/move/lang/core/psi/MvPsiFactory.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/MvPsiFactory.kt
@@ -53,11 +53,6 @@ class MvPsiFactory(val project: Project) {
         createFromText<MvModule>("module $text {}")?.nameIdentifier
             ?: error("Failed to create identifier: `$text`")
 
-//    fun createColon(): PsiElement =
-//        const("const C: u8 = 1;")
-//            .descendantOfTypeStrict<MvTypeAnnotation>()!!
-//            .getChild(MvElementTypes.COLON)!!
-
     fun createComma(): PsiElement =
         createFromText<MvValueArgument>(
             """
@@ -81,9 +76,8 @@ class MvPsiFactory(val project: Project) {
         createFromText("module 0x1::_DummyModule { $text }")
             ?: error("Failed to create const")
 
-    @Suppress("InvalidModuleDeclaration")
-    fun builtinConst(text: String): MvConst =
-        createFromText("module spec_builtins { $text }") ?: error("Failed to create const")
+    fun specBuiltinConst(text: String): MvConst =
+        createFromText("module 0x0::spec_builtins { $text }") ?: error("Failed to create const")
 
     inline fun <reified T : MvExpr> expr(text: String): T =
         createFromText("module 0x1::_DummyModule { fun call() { let _ = $text; } }")
@@ -104,40 +98,26 @@ class MvPsiFactory(val project: Project) {
             ?: error("Failed to create an item import from text: `$speckText`")
     }
 
-    fun itemUseSpeck(fqModuleText: String, useItem: String): MvItemUseSpeck {
-        return createFromText("module 0x1::_DummyModule { use $fqModuleText::$useItem; }")
-            ?: error("Cannot create item use speck")
-//        return if (names.size == 1) {
-//            createFromText("module 0x1::_DummyModule { use $fqModuleText::$useItem; }")
-//                ?: error("")
-//        } else {
-//            val namesText = names.joinToString(", ", "{", "}")
-//            createFromText("module 0x1::_DummyModule { use $fqModuleText::$namesText; }")
-//                ?: error("")
-//        }
+    fun useSpeckWithEmptyUseGroup(): MvUseSpeck {
+        return createFromText("module 0x1::_DummyModule { use 0x1::dummy::{}; }")
+            ?: error("Failed to create a use speck")
     }
 
-    fun itemUseSpeck(fqModuleText: String, names: List<String>): MvItemUseSpeck {
-        assert(names.isNotEmpty())
-        return if (names.size == 1) {
-            createFromText("module 0x1::_DummyModule { use $fqModuleText::${names.first()}; }")
-                ?: error("")
-        } else {
-            val namesText = names.joinToString(", ", "{", "}")
-            createFromText("module 0x1::_DummyModule { use $fqModuleText::$namesText; }")
-                ?: error("")
-        }
+    fun useSpeck(text: String): MvUseSpeck {
+        return createFromText("module 0x1::_DummyModule { use $text; }")
+            ?: error("Failed to create an item import from text: `$text`")
     }
 
-    fun useItemGroup(items: List<String>): MvUseItemGroup {
-        val allItemsText = items.joinToString(", ")
-        return createFromText("module 0x1::_DummyModule { use 0x1::Module::{$allItemsText}; }")
-            ?: error("Failed to create an item import from text: `$allItemsText`")
+    fun useSpeckForGroup(text: String): MvUseSpeck {
+        val useGroup = createFromText<MvUseGroup>("module 0x1::_DummyModule { use 0x1::Module::{$text}; }")
+            ?: error("Failed to create an item import from text: `$text`")
+        return useGroup.useSpeckList.first()
     }
 
-    fun useItem(text: String): MvUseItem {
-        return createFromText("module 0x1::_DummyModule { use 0x1::Module::$text; }")
+    fun useSpeckForGroupWithDummyAlias(text: String): MvUseSpeck {
+        val useGroup = createFromText<MvUseGroup>("module 0x1::_DummyModule { use 0x1::Module::{$text as dummy}; }")
             ?: error("Failed to create an item import from text: `$text`")
+        return useGroup.useSpeckList.first()
     }
 
     fun acquires(text: String): MvAcquiresType {
diff --git a/src/main/kotlin/org/move/lang/core/psi/NamedItemScope.kt b/src/main/kotlin/org/move/lang/core/psi/NamedItemScope.kt
index 82f78e395..60b8bef2f 100644
--- a/src/main/kotlin/org/move/lang/core/psi/NamedItemScope.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/NamedItemScope.kt
@@ -11,6 +11,15 @@ enum class NamedItemScope {
     TEST,
     VERIFY;
 
+    val isTest get() = this == TEST
+
+    fun shrinkScope(adjustmentScope: NamedItemScope): NamedItemScope {
+        if (this == MAIN) {
+            return adjustmentScope
+        }
+        return this
+    }
+
     companion object {
         fun all(): Set<NamedItemScope> = setOf(MAIN, TEST, VERIFY)
     }
diff --git a/src/main/kotlin/org/move/lang/core/psi/PathExpr.kt b/src/main/kotlin/org/move/lang/core/psi/PathExpr.kt
index 6ef30b302..0ed77ecf3 100644
--- a/src/main/kotlin/org/move/lang/core/psi/PathExpr.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/PathExpr.kt
@@ -1,5 +1,5 @@
 package org.move.lang.core.psi
 
 interface PathExpr : MvElement {
-    val path: MvPath
+    val path: MvPath get() = error("unreachable")
 }
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvAddressRef.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvAddressRef.kt
index 281e5cde7..56c28500e 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvAddressRef.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvAddressRef.kt
@@ -1,21 +1,5 @@
 package org.move.lang.core.psi.ext
 
 import org.move.lang.core.psi.MvAddressRef
-import org.move.lang.moveProject
 
 val MvAddressRef.normalizedText: String get() = this.text.lowercase()
-
-val MvAddressRef.useGroupLevel: Int
-    get() {
-        // sort to the end if not a named address
-        if (this.namedAddress == null) return 4
-
-        val name = this.namedAddress?.text.orEmpty().lowercase()
-        val currentPackageAddresses =
-            this.moveProject?.currentPackageAddresses()?.keys.orEmpty().map { it.lowercase() }
-        return when (name) {
-            "std", "aptos_std", "aptos_framework", "aptos_token" -> 1
-            !in currentPackageAddresses -> 2
-            else -> 3
-        }
-    }
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvAttrItem.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvAttrItem.kt
index eb771539c..f76b354a7 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvAttrItem.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvAttrItem.kt
@@ -8,6 +8,8 @@ import org.move.lang.core.resolve.ref.MvPolyVariantReferenceCached
 
 val MvAttrItem.attr: MvAttr? get() = this.parent as? MvAttr
 
+val MvAttrItem.isAbortCode: Boolean get() = this.identifier.textMatches("abort_code")
+
 class AttrItemReferenceImpl(
     element: MvAttrItem,
     val ownerFunction: MvFunction
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvElement.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvElement.kt
index 9a7241946..adfaebc40 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvElement.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvElement.kt
@@ -31,7 +31,7 @@ val MvNamedElement.isMslOnlyItem: Boolean
         var element: PsiElement? = this
         while (element != null) {
             // use items always non-msl, otherwise import resolution doesn't work correctly
-            if (element is MvUseItem) return false
+//            if (element is MvUseItem) return false
 
             // module items
             if (element is MvModule
@@ -49,8 +49,6 @@ val MvNamedElement.isMslOnlyItem: Boolean
 
 val MvMethodOrPath.isMslScope get() = this.isMslInner()
 
-val MvModuleRef.isMslScope: Boolean get() = this.isMslInner()
-
 fun PsiElement.isMsl(): Boolean = isMslInner()
 //fun PsiElement.isMslLegacy(): Boolean {
 //    return CachedValuesManager.getProjectPsiDependentCache(this) {
@@ -79,7 +77,7 @@ private fun PsiElement.isMslInner(): Boolean {
         var element: PsiElement? = it
         while (element != null) {
             // use items always non-msl, otherwise import resolution doesn't work correctly
-            if (element is MvUseItem) return@getProjectPsiDependentCache false
+            if (element is MvUseSpeck) return@getProjectPsiDependentCache false
 
             // module items
             if (element is MvModule
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvFQModuleRef.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvFQModuleRef.kt
index 5167ed1e7..291e055b2 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvFQModuleRef.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvFQModuleRef.kt
@@ -1,21 +1,13 @@
 package org.move.lang.core.psi.ext
 
-import com.intellij.lang.ASTNode
-import com.intellij.psi.PsiElement
-import org.move.lang.MvElementTypes
-import org.move.lang.core.psi.MvElementImpl
-import org.move.lang.core.psi.MvFQModuleRef
-import org.move.lang.core.resolve.ref.MvFQModuleReference
-import org.move.lang.core.resolve.ref.MvFQModuleReferenceImpl
-
-abstract class MvFQModuleRefMixin(node: ASTNode) : MvElementImpl(node),
-                                                   MvFQModuleRef {
-    override val identifier: PsiElement?
-        get() = findChildByType(MvElementTypes.IDENTIFIER)
-
-    override fun getReference(): MvFQModuleReference {
-        return MvFQModuleReferenceImpl(this)
-    }
-
-    override fun getMul(): PsiElement? = null
-}
+//abstract class MvFQModuleRefMixin(node: ASTNode) : MvElementImpl(node),
+//                                                   MvFQModuleRef {
+//    override val identifier: PsiElement?
+//        get() = findChildByType(MvElementTypes.IDENTIFIER)
+//
+//    override fun getReference(): MvFQModuleReference {
+//        return MvFQModuleReferenceImpl(this)
+//    }
+//
+//    override fun getMul(): PsiElement? = null
+//}
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvFunction.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvFunction.kt
index 73baf52ef..1cdc86d74 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvFunction.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvFunction.kt
@@ -50,6 +50,9 @@ val MvFunction.isEntry: Boolean
         return stub?.isEntry ?: this.isChildExists(MvElementTypes.ENTRY)
     }
 
+val MvFunction.isPublicScript: Boolean
+    get() = this.visibilityModifier?.isPublicScript ?: false
+
 val MvFunction.isInline: Boolean get() = this.isChildExists(MvElementTypes.INLINE)
 
 val MvFunction.isView: Boolean
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvItemElement.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvItemElement.kt
new file mode 100644
index 000000000..64a4b9329
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvItemElement.kt
@@ -0,0 +1,5 @@
+package org.move.lang.core.psi.ext
+
+import org.move.lang.core.psi.MvNameIdentifierOwner
+
+interface MvItemElement: MvVisibilityOwner, MvDocAndAttributeOwner, MvNameIdentifierOwner
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvItemSpecBlock.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvItemSpecBlock.kt
index 964d65e06..6bd6eee04 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvItemSpecBlock.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvItemSpecBlock.kt
@@ -8,15 +8,15 @@ fun MvSpecCodeBlock.builtinSpecConsts(): List<MvConst> {
     return CachedValuesManager.getProjectPsiDependentCache(this) {
         val psiFactory = it.project.psiFactory
         listOf(
-            psiFactory.builtinConst(
+            psiFactory.specBuiltinConst(
                 "const MAX_U256: u256 = " +
                         "115792089237316195423570985008687907853269984665640564039457584007913129639935;"
             ),
-            psiFactory.builtinConst("const MAX_U128: u128 = 340282366920938463463374607431768211455;"),
-            psiFactory.builtinConst("const MAX_U64: u64 = 18446744073709551615;"),
-            psiFactory.builtinConst("const MAX_U32: u32 = 4294967295;"),
-            psiFactory.builtinConst("const MAX_U16: u16 = 65535;"),
-            psiFactory.builtinConst("const MAX_U8: u8 = 255;"),
+            psiFactory.specBuiltinConst("const MAX_U128: u128 = 340282366920938463463374607431768211455;"),
+            psiFactory.specBuiltinConst("const MAX_U64: u64 = 18446744073709551615;"),
+            psiFactory.specBuiltinConst("const MAX_U32: u32 = 4294967295;"),
+            psiFactory.specBuiltinConst("const MAX_U16: u16 = 65535;"),
+            psiFactory.specBuiltinConst("const MAX_U8: u8 = 255;"),
         )
     }
 }
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvItemUseSpeck.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvItemUseSpeck.kt
deleted file mode 100644
index 87d4a0413..000000000
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvItemUseSpeck.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.move.lang.core.psi.ext
-
-import org.move.lang.core.psi.MvItemUseSpeck
-
-fun MvItemUseSpeck.names(): List<String> =
-    this.useItemGroup?.names ?: listOfNotNull(this.useItem?.name)
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvItemsOwner.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvItemsOwner.kt
new file mode 100644
index 000000000..270d2201b
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvItemsOwner.kt
@@ -0,0 +1,35 @@
+package org.move.lang.core.psi.ext
+
+import org.move.lang.core.psi.*
+import org.move.stdext.buildList
+
+interface MvItemsOwner: MvElement {
+    val useStmtList: List<MvUseStmt> get() = emptyList()
+}
+
+fun MvItemsOwner.items(): Sequence<MvElement> {
+    return generateSequence(firstChild) { it.nextSibling }
+        .filterIsInstance<MvElement>()
+        .filter { it !is MvAttr }
+}
+
+val MvItemsOwner.itemElements: List<MvItemElement>
+    get() {
+        return this.items().filterIsInstance<MvItemElement>().toList()
+    }
+
+val MvModule.innerSpecItems: List<MvItemElement>
+    get() {
+        val module = this
+        return buildList {
+            addAll(module.allModuleSpecs()
+                       .map {
+                           it.moduleItemSpecs()
+                               .flatMap { spec -> spec.itemSpecBlock?.globalVariables().orEmpty() }
+                       }
+                       .flatten())
+            addAll(module.specInlineFunctions())
+        }
+    }
+
+fun MvItemsOwner.allUseItems(): List<MvNamedElement> = emptyList()
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvMethodCall.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvMethodCall.kt
index 1734b6982..3395740bc 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvMethodCall.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvMethodCall.kt
@@ -7,12 +7,11 @@ import org.move.lang.core.psi.*
 import org.move.lang.core.resolve.ScopeItem
 import org.move.lang.core.resolve.ref.MvPolyVariantReference
 import org.move.lang.core.resolve.ref.MvPolyVariantReferenceBase
-import org.move.lang.core.resolve.ref.Visibility
 import org.move.lang.core.types.address
-import org.move.lang.core.types.infer.foldTyTypeParameterWith
 import org.move.lang.core.types.infer.inference
-import org.move.lang.core.types.ty.*
-import org.move.lang.moveProject
+import org.move.lang.core.types.ty.Ty
+import org.move.lang.core.types.ty.TyStruct
+import org.move.lang.core.types.ty.TyVector
 import org.move.stdext.wrapWithList
 
 typealias MatchSequence<T> = Sequence<ScopeItem<T>>
@@ -41,29 +40,6 @@ fun MvModule.is0x1Address(moveProject: MoveProject): Boolean {
     return moduleAddress == "0x00000000000000000000000000000001"
 }
 
-fun getMethodVariants(element: MvMethodOrField, receiverTy: Ty, msl: Boolean): MatchSequence<MvFunction> {
-    val moveProject = element.moveProject ?: return emptySequence()
-    val receiverTyItemModule = receiverTy.itemModule(moveProject) ?: return emptySequence()
-
-    val elementScopes = Visibility.visibilityScopesForElement(element).toMutableSet()
-    if (element.containingModule == receiverTyItemModule) {
-        elementScopes.add(Visibility.Internal)
-    }
-    val functions =
-        elementScopes
-            .flatMap { elementScope -> receiverTyItemModule.functionsVisibleInScope(elementScope) }
-            .filter {
-                val selfTy = it.selfParamTy(msl) ?: return@filter false
-                // need to use TyVar here, loweredType() erases them
-                val selfTyWithTyVars =
-                    selfTy.foldTyTypeParameterWith { tp -> TyInfer.TyVar(tp) }
-                TyReference.isCompatibleWithAutoborrow(receiverTy, selfTyWithTyVars, msl)
-            }
-    return functions
-        .filter { it.name != null }
-        .map { ScopeItem(it.name!!, it) }.asSequence()
-}
-
 class MvMethodCallReferenceImpl(
     element: MvMethodCall
 ):
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvModule.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvModule.kt
index c1a5adb74..6ff04f33a 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvModule.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvModule.kt
@@ -6,11 +6,9 @@ import com.intellij.navigation.ItemPresentation
 import com.intellij.openapi.project.Project
 import com.intellij.psi.stubs.IStubElementType
 import com.intellij.psi.util.CachedValuesManager.getProjectPsiDependentCache
-import org.move.cli.containingMovePackage
-import org.move.cli.settings.moveSettings
 import org.move.ide.MoveIcons
+import org.move.lang.core.completion.getOriginalOrSelf
 import org.move.lang.core.psi.*
-import org.move.lang.core.resolve.ref.Visibility
 import org.move.lang.core.stubs.MvFunctionStub
 import org.move.lang.core.stubs.MvModuleStub
 import org.move.lang.core.stubs.MvStructStub
@@ -28,26 +26,14 @@ fun MvModule.hasTestFunctions(): Boolean = this.testFunctions().isNotEmpty()
 fun MvModule.addressRef(): MvAddressRef? =
     this.addressRef ?: (this.ancestorStrict<MvAddressDef>())?.addressRef
 
-data class FQModule(val address: Address, val name: String)
-
-fun MvModule.fqModule(): FQModule? {
-    val moveProj = this.moveProject ?: return null
-    val address = this.address(moveProj) ?: return null
-    val name = this.name ?: return null
-    return FQModule(address, name)
-}
-
-val MvModule.declaredFriendModules: Set<FQModule>
+val MvModule.friendModules: Set<MvModule>
     get() {
-        val block = this.moduleBlock ?: return emptySet()
-        val friendModuleRefs = block.friendDeclList.mapNotNull { it.fqModuleRef }
-        val moveProj = block.moveProject
-
-        val friends = mutableSetOf<FQModule>()
-        for (moduleRef in friendModuleRefs) {
-            val address = moduleRef.addressRef.address(moveProj) ?: continue
-            val identifier = moduleRef.identifier?.text ?: continue
-            friends.add(FQModule(address, identifier))
+        val moduleBlock = this.moduleBlock ?: return emptySet()
+        val friendModulePaths = moduleBlock.friendDeclList.mapNotNull { it.path }
+        val friends = mutableSetOf<MvModule>()
+        for (modulePath in friendModulePaths) {
+            val module = modulePath.reference?.resolveFollowingAliases() as? MvModule ?: continue
+            friends.add(module)
         }
         return friends
     }
@@ -60,15 +46,19 @@ fun MvModule.allFunctions(): List<MvFunction> {
 
 fun MvModule.allNonTestFunctions(): List<MvFunction> =
 //    allFunctions().filter { f -> !f.isTest }
-    getProjectPsiDependentCache(this) {
-        it.allFunctions().filter { f -> !f.hasTestAttr }
-    }
+    this.allFunctions().filter { f -> !f.hasTestAttr }
+//    getProjectPsiDependentCache(this) {
+//    }
 
 fun MvModule.testFunctions(): List<MvFunction> =
     getProjectPsiDependentCache(this) {
         it.allFunctions().filter { f -> f.hasTestAttr }
     }
 
+val MvModule.isBuiltins: Boolean get() = this.name == "builtins" && (this.address(null)?.is0x0 ?: false)
+val MvModule.isSpecBuiltins: Boolean
+    get() = this.name == "spec_builtins" && (this.address(null)?.is0x0 ?: false)
+
 fun MvModule.builtinFunctions(): List<MvFunction> {
     return getProjectPsiDependentCache(this) {
         val text = """
@@ -95,43 +85,6 @@ fun MvModule.builtinFunctions(): List<MvFunction> {
     }
 }
 
-fun MvModule.functionsVisibleInScope(visibility: Visibility): List<MvFunction> {
-    return when (visibility) {
-        is Visibility.Public ->
-            allNonTestFunctions()
-                .filter { it.visibility == FunctionVisibility.PUBLIC }
-        is Visibility.PublicScript ->
-            allNonTestFunctions()
-                .filter { it.visibility == FunctionVisibility.PUBLIC_SCRIPT }
-        is Visibility.PublicFriend -> {
-            val friendFunctions =
-                allNonTestFunctions().filter { it.visibility == FunctionVisibility.PUBLIC_FRIEND }
-            if (friendFunctions.isEmpty()) return emptyList()
-
-            val currentModule = visibility.currentModule.element
-            if (currentModule != null
-                && currentModule.fqModule() in this.declaredFriendModules
-            ) {
-                friendFunctions
-            } else {
-                emptyList()
-            }
-        }
-        is Visibility.PublicPackage -> {
-            if (!project.moveSettings.enablePublicPackage) {
-                return emptyList()
-            }
-            val modulePackage = this.containingMovePackage
-            if (visibility.originPackage == modulePackage) {
-                this.allNonTestFunctions()
-            } else {
-                emptyList()
-            }
-        }
-        is Visibility.Internal -> allNonTestFunctions()
-    }
-}
-
 fun MvModule.entryFunctions(): List<MvFunction> = this.allFunctions().filter { it.isEntry }
 
 fun MvModule.viewFunctions(): List<MvFunction> = this.allFunctions().filter { it.isView }
@@ -196,7 +149,7 @@ val MvModuleBlock.module: MvModule get() = this.parent as MvModule
 ////    this.childrenOfType<MvItemSpec>()
 ////        .filter { it.itemSpecRef?.moduleKw != null }
 
-val MvModuleSpec.moduleItem: MvModule? get() = this.fqModuleRef?.reference?.resolve() as? MvModule
+val MvModuleSpec.moduleItem: MvModule? get() = this.path?.reference?.resolve() as? MvModule
 
 val MvModuleSpecBlock.moduleSpec: MvModuleSpec get() = this.parent as MvModuleSpec
 
@@ -222,36 +175,40 @@ fun MvModuleSpec.specInlineFunctions(): List<MvSpecInlineFunction> =
     this.moduleItemSpecs().flatMap { it.specInlineFunctions() }
 
 fun MvModule.allModuleSpecs(): List<MvModuleSpec> {
-    return getProjectPsiDependentCache(this) {
-        val moveProject = it.moveProject ?: return@getProjectPsiDependentCache emptyList()
-        val moduleName = it.name ?: return@getProjectPsiDependentCache emptyList()
-        val file = it.containingMoveFile ?: return@getProjectPsiDependentCache emptyList()
-
-        val searchScope = moveProject.searchScope()
-        val moduleSpecs = file.moduleSpecs() +
-                MvModuleSpecIndex.getElementsByModuleName(it.project, moduleName, searchScope)
-        if (moduleSpecs.isEmpty()) return@getProjectPsiDependentCache emptyList()
-
-        val currentModule = it.fqModule() ?: return@getProjectPsiDependentCache emptyList()
-        moduleSpecs
-            .filter { moduleSpec ->
-                val module = moduleSpec.fqModuleRef?.reference?.resolve() as? MvModule ?: return@filter false
-                currentModule == module.fqModule()
-            }
-            .toList()
-    }
+    val moveProject = this.moveProject ?: return emptyList()
+    val moduleName = this.name ?: return emptyList()
+
+    val searchScope = moveProject.searchScope()
+    // all `spec 0x1::m {}` for the current module
+    val moduleSpecs = MvModuleSpecIndex.getElementsByModuleName(this.project, moduleName, searchScope)
+    if (moduleSpecs.isEmpty()) return emptyList()
+
+//    val currentModule = this.fqModule() ?: return emptyList()
+    return moduleSpecs
+        .filter { moduleSpec ->
+            val specModule = moduleSpec.moduleItem ?: return@filter false
+            isModulesEqual(this, specModule)
+//            currentModule == specModule.fqModule()
+        }
+        .toList()
+//    return getProjectPsiDependentCache(this) {
+//    }
 }
 
 fun MvModule.allModuleSpecBlocks(): List<MvModuleSpecBlock> {
     return this.allModuleSpecs().mapNotNull { it.moduleSpecBlock }
 }
 
-abstract class MvModuleMixin : MvStubbedNamedElementImpl<MvModuleStub>,
-                               MvModule {
+fun isModulesEqual(left: MvModule, right: MvModule): Boolean {
+    return left.getOriginalOrSelf() == right.getOriginalOrSelf()
+}
+
+abstract class MvModuleMixin: MvStubbedNamedElementImpl<MvModuleStub>,
+                              MvModule {
 
-    constructor(node: ASTNode) : super(node)
+    constructor(node: ASTNode): super(node)
 
-    constructor(stub: MvModuleStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType)
+    constructor(stub: MvModuleStub, nodeType: IStubElementType<*, *>): super(stub, nodeType)
 
     override fun getIcon(flags: Int): Icon = MoveIcons.MODULE
 
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvModuleRef.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvModuleRef.kt
index f4623a808..e9ab788f5 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvModuleRef.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvModuleRef.kt
@@ -1,23 +1,15 @@
 package org.move.lang.core.psi.ext
 
-import com.intellij.lang.ASTNode
-import org.move.lang.core.psi.MvElementImpl
-import org.move.lang.core.psi.MvFQModuleRef
-import org.move.lang.core.psi.MvModuleRef
-import org.move.lang.core.psi.containingModule
-import org.move.lang.core.resolve.ref.MvModuleReferenceImpl
-import org.move.lang.core.resolve.ref.MvPolyVariantReference
+//val MvModuleRef.isSelfModuleRef: Boolean
+//    get() =
+//        this !is MvFQModuleRef
+//                && this.referenceName == "Self"
+//                && this.containingModule != null
 
-val MvModuleRef.isSelfModuleRef: Boolean
-    get() =
-        this !is MvFQModuleRef
-                && this.referenceName == "Self"
-                && this.containingModule != null
-
-abstract class MvModuleRefMixin(node: ASTNode) : MvElementImpl(node), MvModuleRef {
-
-    override fun getReference(): MvPolyVariantReference? = MvModuleReferenceImpl(this)
-}
+//abstract class MvModuleRefMixin(node: ASTNode) : MvElementImpl(node), MvModuleRef {
+//
+//    override fun getReference(): MvPolyVariantReference? = MvModuleReferenceImpl(this)
+//}
 
 //abstract class MvImportedModuleRefMixin(node: ASTNode) : MvReferenceElementImpl(node),
 //                                                           MvImportedModuleRef {
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvModuleUseSpeck.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvModuleUseSpeck.kt
deleted file mode 100644
index 1eb0f84dc..000000000
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvModuleUseSpeck.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.move.lang.core.psi.ext
-
-import com.intellij.lang.ASTNode
-import com.intellij.psi.PsiElement
-import org.move.ide.MoveIcons
-import org.move.lang.core.psi.MvModuleUseSpeck
-import org.move.lang.core.psi.impl.MvNamedElementImpl
-import javax.swing.Icon
-
-abstract class MvModuleUseSpeckMixin(node: ASTNode) : MvNamedElementImpl(node),
-                                                      MvModuleUseSpeck {
-    override val nameElement: PsiElement?
-        get() =
-            useAlias?.identifier ?: fqModuleRef?.identifier
-
-    override fun getIcon(flags: Int): Icon = MoveIcons.MODULE
-
-//    override fun getReference(): MvReference {
-//        return MvModuleReferenceImpl(moduleRef)
-//    }
-
-}
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvPath.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvPath.kt
index 2ed9700d1..effaa9cdf 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvPath.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvPath.kt
@@ -5,11 +5,38 @@ import org.move.cli.settings.debugErrorOrFallback
 import org.move.ide.annotator.BUILTIN_TYPE_IDENTIFIERS
 import org.move.ide.annotator.PRIMITIVE_TYPE_IDENTIFIERS
 import org.move.ide.annotator.SPEC_ONLY_PRIMITIVE_TYPES
+import org.move.ide.inspections.imports.BasePathType
+import org.move.ide.inspections.imports.basePathType
 import org.move.lang.core.psi.*
-import org.move.lang.core.resolve.ref.MvPathReference
-import org.move.lang.core.resolve.ref.MvPathReferenceImpl
-import org.move.lang.core.resolve.ref.MvReferenceElement
+import org.move.lang.core.resolve.ref.MvPath2Reference
 import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.resolve2.ref.Path2ReferenceImpl
+import java.util.*
+
+/** For `Foo::bar::baz::quux` path returns `Foo` */
+tailrec fun <T: MvPath> T.basePath(): T {
+    @Suppress("UNCHECKED_CAST")
+    val qualifier = path as T?
+    return if (qualifier === null) this else qualifier.basePath()
+}
+
+/** For `Foo::bar` in `Foo::bar::baz::quux` returns `Foo::bar::baz::quux` */
+tailrec fun MvPath.rootPath(): MvPath {
+    // Use `parent` instead of `context` because of better performance.
+    // Assume nobody set a context for a part of a path
+    val parent = parent
+    return if (parent is MvPath) parent.rootPath() else this
+}
+
+val MvPath.length: Int get() {
+    var length = 1
+    var currentPath = this
+    while (currentPath.path != null) {
+        currentPath = currentPath.path!!
+        length += 1
+    }
+    return length
+}
 
 fun MvPath.isPrimitiveType(): Boolean =
     this.parent is MvPathType
@@ -41,53 +68,101 @@ val MvPath.isUpdateFieldArg2: Boolean
 
 val MvPath.identifierName: String? get() = identifier?.text
 
-val MvPath.nullModuleRef: Boolean
-    get() =
-        identifier != null && this.moduleRef == null
-
-val MvPath.isQualPath: Boolean get() = !this.nullModuleRef
+//val MvPath.nullModuleRef: Boolean
+//    get() =
+//        identifier != null && this.moduleRef == null
 
-val MvPath.maybeStruct get() = reference?.resolveWithAliases() as? MvStruct
+val MvPath.maybeStruct get() = reference?.resolveFollowingAliases() as? MvStruct
 
-val MvPath.maybeSchema get() = reference?.resolveWithAliases() as? MvSchema
+val MvPath.maybeSchema get() = reference?.resolveFollowingAliases() as? MvSchema
 
-fun MvPath.namespaces(): Set<Namespace> {
+fun MvPath.allowedNamespaces(): Set<Namespace> {
     val parent = this.parent
+//    return when (parent) {
+//        is MvPath,
+//        is MvPathType -> TYPES
+//        else -> VALUES
+//    }
+    return if (parent is MvPath) EnumSet.of(Namespace.MODULE) else rootNamespace(this)
+//    return when {
+//        parent is MvSchemaLit || parent is MvSchemaRef -> setOf(Namespace.SCHEMA)
+//        parent is MvPathType -> setOf(Namespace.TYPE)
+//        parent is MvCallExpr -> setOf(Namespace.FUNCTION)
+//        parent is MvRefExpr && parent.isAbortCodeConst() -> setOf(Namespace.CONST)
+//        parent is MvRefExpr -> setOf(Namespace.NAME)
+////            parent is MvRefExpr && this.nullModuleRef -> setOf(Namespace.NAME)
+////            parent is MvRefExpr && !this.nullModuleRef -> setOf(Namespace.NAME, Namespace.MODULE)
+//        // TODO: it's own namespace?
+//        parent is MvStructLitExpr || parent is MvStructPat -> setOf(Namespace.NAME)
+//        parent is MvAccessSpecifier -> setOf(Namespace.TYPE)
+//        parent is MvAddressSpecifierArg -> setOf(Namespace.FUNCTION)
+//        parent is MvAddressSpecifierCallParam -> setOf(Namespace.NAME)
+//        else -> debugErrorOrFallback(
+//            "Cannot build path namespaces: unhandled parent type ${parent.elementType}",
+//            setOf(Namespace.NAME)
+//        )
+//    }
+}
+
+private fun rootNamespace(rootPath: MvPath): Set<Namespace> {
+    val parent = rootPath.parent
+    check(parent !is MvPath)
     return when {
-        parent is MvSchemaLit || parent is MvSchemaRef -> setOf(Namespace.SCHEMA)
-        parent is MvPathType -> setOf(Namespace.TYPE)
-        parent is MvCallExpr -> setOf(Namespace.FUNCTION)
-        parent is MvRefExpr && parent.isAbortCodeConst() -> setOf(Namespace.CONST)
-        parent is MvRefExpr -> setOf(Namespace.NAME)
-//            parent is MvRefExpr && this.nullModuleRef -> setOf(Namespace.NAME)
-//            parent is MvRefExpr && !this.nullModuleRef -> setOf(Namespace.NAME, Namespace.MODULE)
-        // TODO: it's own namespace?
-        parent is MvStructLitExpr || parent is MvStructPat -> setOf(Namespace.NAME)
-        parent is MvAccessSpecifier -> setOf(Namespace.TYPE)
-        parent is MvAddressSpecifierArg -> setOf(Namespace.FUNCTION)
-        parent is MvAddressSpecifierCallParam -> setOf(Namespace.NAME)
+        parent is MvSchemaLit || parent is MvSchemaRef -> EnumSet.of(Namespace.SCHEMA)
+        parent is MvPathType -> EnumSet.of(Namespace.TYPE)
+        parent is MvCallExpr -> EnumSet.of(Namespace.FUNCTION)
+//        parent is MvRefExpr && parent.isAbortCodeConst() -> EnumSet.of(Namespace.CONST)
+        parent is MvRefExpr && rootPath.hasAncestor<MvAttrItem>() -> EnumSet.of(Namespace.NAME, Namespace.MODULE)
+        parent is MvRefExpr -> EnumSet.of(Namespace.NAME)
+//        parent is MvRefExpr -> EnumSet.of(Namespace.NAME, Namespace.CONST)
+        parent is MvStructLitExpr || parent is MvStructPat -> EnumSet.of(Namespace.TYPE)
+//        parent is MvStructLitExpr || parent is MvStructPat -> EnumSet.of(Namespace.NAME)
+        parent is MvAccessSpecifier -> EnumSet.of(Namespace.TYPE)
+        parent is MvAddressSpecifierArg -> EnumSet.of(Namespace.FUNCTION)
+        parent is MvAddressSpecifierCallParam -> EnumSet.of(Namespace.NAME)
+        parent is MvFriendDecl -> EnumSet.of(Namespace.MODULE)
+        parent is MvModuleSpec -> EnumSet.of(Namespace.MODULE)
+            parent is MvUseSpeck -> Namespace.all()
         else -> debugErrorOrFallback(
             "Cannot build path namespaces: unhandled parent type ${parent.elementType}",
-            setOf(Namespace.NAME)
+            EnumSet.of(Namespace.NAME)
         )
     }
 }
 
-abstract class MvPathMixin(node: ASTNode) : MvElementImpl(node), MvPath {
+val MvPath.qualifier: MvPath?
+    get() {
+        path?.let { return it }
+        var ctx = context
+        while (ctx is MvPath) {
+            ctx = ctx.context
+        }
+        // returns the base qualifier, if it's inside the MvUseGroup
+        return (ctx as? MvUseSpeck)?.qualifier
+    }
+
+abstract class MvPathMixin(node: ASTNode): MvElementImpl(node), MvPath {
 
-    override fun getReference(): MvPathReference? = MvPathReferenceImpl(this)
+    override fun getReference(): MvPath2Reference? = Path2ReferenceImpl(this)
 }
 
-fun MvReferenceElement.importCandidateNamespaces(): Set<Namespace> {
+fun MvPath.importCandidateNamespaces(): Set<Namespace> {
     val parent = this.parent
     return when (parent) {
         is MvPathType -> setOf(Namespace.TYPE)
         is MvSchemaLit, is MvSchemaRef -> setOf(Namespace.SCHEMA)
-        else ->
-            when (this) {
-                is MvModuleRef -> setOf(Namespace.MODULE)
-                is MvPath -> setOf(Namespace.NAME, Namespace.FUNCTION)
-                else -> Namespace.all()
+        else -> {
+            val baseBaseType = this.basePathType()
+            when (baseBaseType) {
+                is BasePathType.Module -> EnumSet.of(Namespace.MODULE)
+                else -> EnumSet.of(Namespace.NAME, Namespace.FUNCTION)
             }
+        }
     }
 }
+
+val MvPath.hasColonColon: Boolean get() = colonColon != null
+
+val MvPath.useSpeck: MvUseSpeck? get() = this.rootPath().parent as? MvUseSpeck
+
+val MvPath.isUseSpeck get() = useSpeck != null
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvRefExpr.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvRefExpr.kt
index 06a7dba1f..e54cdf537 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvRefExpr.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvRefExpr.kt
@@ -8,7 +8,7 @@ import org.move.lang.core.psi.MvRefExpr
 fun MvRefExpr.isAbortCodeConst(): Boolean {
     val abortCodeItem =
         (this.parent.parent as? MvAttrItem)
-            ?.takeIf { it.identifier.text == "abort_code" }
+            ?.takeIf { it.isAbortCode }
             ?: return false
     val attr = abortCodeItem.ancestorStrict<MvAttr>() ?: return false
     return (attr.owner as? MvFunction)?.hasTestAttr ?: false
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLit.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLit.kt
index 80cfbc99c..2c4637c19 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLit.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLit.kt
@@ -4,8 +4,6 @@ import org.move.lang.core.psi.MvSchema
 import org.move.lang.core.psi.MvSchemaLit
 import org.move.lang.core.psi.MvSchemaLitField
 
-val MvSchemaLit.schema: MvSchema? get() = this.path.reference?.resolveWithAliases() as? MvSchema
+val MvSchemaLit.schema: MvSchema? get() = this.path.reference?.resolveFollowingAliases() as? MvSchema
 
 val MvSchemaLit.fields: List<MvSchemaLitField> get() = schemaFieldsBlock?.schemaLitFieldList.orEmpty()
-
-val MvSchemaLit.fieldNames: List<String> get() = fields.map { it.referenceName }
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLitField.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLitField.kt
index c543922a0..db6ef1169 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLitField.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvSchemaLitField.kt
@@ -3,54 +3,72 @@ package org.move.lang.core.psi.ext
 import com.intellij.lang.ASTNode
 import org.move.lang.MvElementTypes
 import org.move.lang.core.psi.*
+import org.move.lang.core.resolve.RsResolveProcessor
+import org.move.lang.core.resolve.SimpleScopeEntry
+import org.move.lang.core.resolve.collectResolveVariants
 import org.move.lang.core.resolve.ref.MvPolyVariantReference
 import org.move.lang.core.resolve.ref.MvPolyVariantReferenceCached
 import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.resolveLocalItem
+import org.move.lang.core.resolve2.resolveBindingForFieldShorthand
 
 val MvSchemaLitField.isShorthand get() = !hasChild(MvElementTypes.COLON)
 
 val MvSchemaLitField.schemaLit: MvSchemaLit? get() = ancestorStrict(stopAt = MvSpecCodeBlock::class.java)
 
-inline fun <reified T : MvElement> MvSchemaLitField.resolveToElement(): T? =
+inline fun <reified T: MvElement> MvSchemaLitField.resolveToElement(): T? =
     reference.multiResolve().filterIsInstance<T>().singleOrNull()
 
 fun MvSchemaLitField.resolveToDeclaration(): MvSchemaFieldStmt? = resolveToElement()
 fun MvSchemaLitField.resolveToBinding(): MvBindingPat? = resolveToElement()
 
-class MvSchemaFieldReferenceImpl(
-    element: MvSchemaLitField
-) : MvPolyVariantReferenceCached<MvSchemaLitField>(element) {
-    override fun multiResolveInner(): List<MvNamedElement> = resolveIntoSchemaField(element)
+//class MvSchemaFieldReferenceImpl(
+//    element: MvSchemaLitField
+//): MvPolyVariantReferenceCached<MvSchemaLitField>(element) {
+//    override fun multiResolveInner(): List<MvNamedElement> = collectSchemaLitFieldResolveVariants(element)
+//}
+
+//class MvSchemaFieldShorthandReferenceImpl(
+//    element: MvSchemaLitField
+//): MvPolyVariantReferenceCached<MvSchemaLitField>(element) {
+//    override fun multiResolveInner(): List<MvNamedElement> {
+//        return listOf(
+//            collectSchemaLitFieldResolveVariants(element),
+//            resolveLocalItem(element, setOf(Namespace.NAME))
+//        ).flatten()
+//    }
+//}
+
+abstract class MvSchemaLitFieldMixin(node: ASTNode): MvElementImpl(node),
+                                                     MvSchemaLitField {
+    override fun getReference(): MvPolyVariantReference =
+        MvSchemaLitFieldReferenceImpl(this, shorthand = this.isShorthand)
 }
 
-class MvSchemaFieldShorthandReferenceImpl(
-    element: MvSchemaLitField
-) : MvPolyVariantReferenceCached<MvSchemaLitField>(element) {
+class MvSchemaLitFieldReferenceImpl(
+    element: MvSchemaLitField,
+    val shorthand: Boolean,
+): MvPolyVariantReferenceCached<MvSchemaLitField>(element) {
     override fun multiResolveInner(): List<MvNamedElement> {
-        return listOf(
-            resolveIntoSchemaField(element),
-            resolveLocalItem(element, setOf(Namespace.NAME))
-        ).flatten()
+        var variants = collectResolveVariants(element.referenceName) {
+            processSchemaLitFieldResolveVariants(element, it)
+        }
+        if (shorthand) {
+            variants += resolveBindingForFieldShorthand(element)
+//            variants += resolveLocalItem(element, setOf(Namespace.NAME))
+        }
+        return variants
     }
 }
 
-abstract class MvSchemaLitFieldMixin(node: ASTNode) : MvElementImpl(node),
-                                                      MvSchemaLitField {
-    override fun getReference(): MvPolyVariantReference {
-        if (this.isShorthand) {
-            return MvSchemaFieldShorthandReferenceImpl(this)
-        } else {
-            return MvSchemaFieldReferenceImpl(this)
+fun processSchemaLitFieldResolveVariants(
+    literalField: MvSchemaLitField,
+    processor: RsResolveProcessor
+): Boolean {
+    val schemaLit = literalField.schemaLit ?: return false
+    val schema = schemaLit.path.maybeSchema ?: return false
+    return schema.fieldBindings
+        .any { field ->
+            processor.process(SimpleScopeEntry(field.name, field, setOf(Namespace.NAME)))
         }
-    }
 }
 
-private fun resolveIntoSchemaField(element: MvSchemaLitField): List<MvNamedElement> {
-    val schemaLit = element.schemaLit ?: return emptyList()
-    val schema = schemaLit.path.maybeSchema
-    val referenceName = element.referenceName
-    return schema
-        ?.fieldBindings.orEmpty()
-        .filter { it.name == referenceName }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvStructLitField.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvStructLitField.kt
index ee8acd9af..767076220 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvStructLitField.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvStructLitField.kt
@@ -3,9 +3,14 @@ package org.move.lang.core.psi.ext
 import com.intellij.lang.ASTNode
 import org.move.lang.MvElementTypes
 import org.move.lang.core.psi.*
+import org.move.lang.core.resolve.RsResolveProcessor
+import org.move.lang.core.resolve.SimpleScopeEntry
+import org.move.lang.core.resolve.collectResolveVariants
+import org.move.lang.core.resolve.ref.MvMandatoryReferenceElement
 import org.move.lang.core.resolve.ref.MvPolyVariantReference
-import org.move.lang.core.resolve.ref.MvStructLitShorthandFieldReferenceImpl
-import org.move.lang.core.resolve.ref.MvStructRefFieldReferenceImpl
+import org.move.lang.core.resolve.ref.MvPolyVariantReferenceCached
+import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.resolve2.resolveBindingForFieldShorthand
 
 val MvStructLitField.structLitExpr: MvStructLitExpr
     get() = ancestorStrict()!!
@@ -13,16 +18,74 @@ val MvStructLitField.structLitExpr: MvStructLitExpr
 val MvStructLitField.isShorthand: Boolean
     get() = !hasChild(MvElementTypes.COLON)
 
-inline fun <reified T : MvElement> MvStructLitField.resolveToElement(): T? =
+inline fun <reified T: MvElement> MvStructLitField.resolveToElement(): T? =
     reference.multiResolve().filterIsInstance<T>().singleOrNull()
 
 fun MvStructLitField.resolveToDeclaration(): MvStructField? = resolveToElement()
 fun MvStructLitField.resolveToBinding(): MvBindingPat? = resolveToElement()
 
-abstract class MvStructLitFieldMixin(node: ASTNode) : MvElementImpl(node),
-                                                      MvStructLitField {
-    override fun getReference(): MvPolyVariantReference {
-        if (!this.isShorthand) return MvStructRefFieldReferenceImpl(this)
-        return MvStructLitShorthandFieldReferenceImpl(this)
+interface MvStructRefField: MvMandatoryReferenceElement
+
+abstract class MvStructLitFieldMixin(node: ASTNode): MvElementImpl(node),
+                                                     MvStructLitField {
+    override fun getReference(): MvPolyVariantReference =
+        MvStructRefFieldReferenceImpl(this, shorthand = this.isShorthand)
+//        if (this.isShorthand) {
+//            return MvStructLitShorthandFieldReferenceImpl(this)
+//        } else {
+//            return MvStructRefFieldReferenceImpl(this)
+//        }
+}
+
+class MvStructRefFieldReferenceImpl(
+    element: MvStructRefField,
+    var shorthand: Boolean,
+): MvPolyVariantReferenceCached<MvStructRefField>(element) {
+
+    override fun multiResolveInner(): List<MvNamedElement> {
+        val referenceName = element.referenceName
+        var variants = collectResolveVariants(referenceName) {
+            processStructRefFieldResolveVariants(element, it)
+        }
+//        var variants = resolveIntoStructField(element)
+        if (shorthand) {
+            variants += resolveBindingForFieldShorthand(element)
+//            variants += resolveLocalItem(element, setOf(Namespace.NAME))
+        }
+        return variants
+//        return listOf(
+//            resolveIntoStructField(element),
+//            resolveLocalItem(element, setOf(Namespace.NAME))
+//        ).flatten()
     }
 }
+
+fun processStructRefFieldResolveVariants(
+    fieldRef: MvStructRefField,
+    processor: RsResolveProcessor
+): Boolean {
+    val structItem = fieldRef.maybeStruct ?: return false
+    return structItem.fields
+        .any { field ->
+            processor.process(SimpleScopeEntry(field.name, field, setOf(Namespace.NAME)))
+        }
+}
+
+fun resolveIntoStructField(element: MvStructRefField): List<MvNamedElement> {
+    val structItem = element.maybeStruct ?: return emptyList()
+    val referenceName = element.referenceName
+    return structItem.fields
+        .filter { it.name == referenceName }
+}
+
+private val MvStructRefField.maybeStruct: MvStruct?
+    get() {
+        return when (this) {
+            is MvStructPatField -> this.structPat.structItem
+            is MvStructLitField -> this.structLitExpr.path.maybeStruct
+            else -> null
+        }
+    }
+
+
+
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPat.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPat.kt
index bf42ba952..c97d7fed9 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPat.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPat.kt
@@ -12,4 +12,4 @@ val MvStructPat.patFieldNames: List<String>
     get() =
         patFields.map { it.referenceName }
 
-val MvStructPat.structItem: MvStruct? get() = this.path.reference?.resolveWithAliases() as? MvStruct
+val MvStructPat.structItem: MvStruct? get() = this.path.reference?.resolveFollowingAliases() as? MvStruct
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPatField.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPatField.kt
index 5864b2984..325d1c0ed 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPatField.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvStructPatField.kt
@@ -4,8 +4,6 @@ import com.intellij.lang.ASTNode
 import com.intellij.psi.PsiElement
 import org.move.lang.core.psi.*
 import org.move.lang.core.resolve.ref.MvPolyVariantReference
-import org.move.lang.core.resolve.ref.MvStructPatShorthandFieldReferenceImpl
-import org.move.lang.core.resolve.ref.MvStructRefFieldReferenceImpl
 
 val MvStructPatField.structPat: MvStructPat
     get() = ancestorStrict()!!
@@ -29,6 +27,7 @@ sealed class PatFieldKind {
      *         ~~~~~~~~~
      */
     data class Full(val ident: PsiElement, val pat: MvPat): PatFieldKind()
+
     /**
      * struct S { a: i32 }
      * let S { ref a } = ...
@@ -44,8 +43,8 @@ val PatFieldKind.fieldName: String
     }
 
 
-abstract class MvStructPatFieldMixin(node: ASTNode) : MvElementImpl(node),
-                                                      MvStructPatField {
+abstract class MvStructPatFieldMixin(node: ASTNode): MvElementImpl(node),
+                                                     MvStructPatField {
     override val referenceNameElement: PsiElement
         get() {
             val bindingPat = this.bindingPat
@@ -56,11 +55,11 @@ abstract class MvStructPatFieldMixin(node: ASTNode) : MvElementImpl(node),
             }
         }
 
-    override fun getReference(): MvPolyVariantReference {
-        return if (this.isShorthand) {
-            MvStructPatShorthandFieldReferenceImpl(this)
-        } else {
-            MvStructRefFieldReferenceImpl(this)
-        }
-    }
+    override fun getReference(): MvPolyVariantReference =
+        MvStructRefFieldReferenceImpl(this, shorthand = this.isShorthand)
+//        return if (this.isShorthand) {
+//            MvStructPatShorthandFieldReferenceImpl(this)
+//        } else {
+//            MvStructRefFieldReferenceImpl(this)
+//        }
 }
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseAlias.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseAlias.kt
index 095e92ae3..fe734dd2c 100644
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseAlias.kt
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseAlias.kt
@@ -1,14 +1,11 @@
 package org.move.lang.core.psi.ext
 
 import com.intellij.lang.ASTNode
-import org.move.lang.core.psi.MvModuleUseSpeck
 import org.move.lang.core.psi.MvUseAlias
-import org.move.lang.core.psi.MvUseItem
+import org.move.lang.core.psi.MvUseSpeck
 import org.move.lang.core.psi.impl.MvNameIdentifierOwnerImpl
 
-val MvUseAlias.useItem: MvUseItem? get() = this.parent as? MvUseItem
+val MvUseAlias.parentUseSpeck: MvUseSpeck get() = this.parent as MvUseSpeck
 
-val MvUseAlias.moduleUseSpeck: MvModuleUseSpeck? get() = this.parent as? MvModuleUseSpeck
-
-abstract class MvUseAliasMixin(node: ASTNode) : MvNameIdentifierOwnerImpl(node),
-                                                MvUseAlias
+abstract class MvUseAliasMixin(node: ASTNode): MvNameIdentifierOwnerImpl(node),
+                                               MvUseAlias
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseGroup.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseGroup.kt
new file mode 100644
index 000000000..7a2a88a79
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseGroup.kt
@@ -0,0 +1,19 @@
+package org.move.lang.core.psi.ext
+
+import com.intellij.psi.PsiComment
+import com.intellij.psi.SyntaxTraverser
+import org.move.lang.core.psi.MvUseGroup
+import org.move.lang.core.psi.MvUseSpeck
+
+val MvUseGroup.parentUseSpeck: MvUseSpeck get() = parent as MvUseSpeck
+
+val MvUseGroup.names get() = this.useSpeckList.mapNotNull { it.path.identifier?.text }
+
+val MvUseGroup.asTrivial: MvUseSpeck?
+    get() {
+        val speck = useSpeckList.singleOrNull() ?: return null
+        // Do not change use-groups with comments
+        if (SyntaxTraverser.psiTraverser(this).traverse().any { it is PsiComment }) return null
+        return speck
+    }
+
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseItem.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseItem.kt
deleted file mode 100644
index 66eaa052e..000000000
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseItem.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.move.lang.core.psi.ext
-
-import com.intellij.lang.ASTNode
-import com.intellij.psi.PsiElement
-import org.move.lang.core.psi.*
-import org.move.lang.core.psi.impl.MvNamedElementImpl
-import org.move.lang.core.resolve.ContextScopeInfo
-import org.move.lang.core.resolve.LetStmtScope
-import org.move.lang.core.resolve.ref.MvPolyVariantReferenceCached
-import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
-import org.move.lang.core.resolve.resolveModuleItem
-
-val MvUseItem.itemUseSpeck: MvItemUseSpeck
-    get() = ancestorStrict() ?: error("MvUseItem outside MvItemUseSpeck")
-
-val MvUseItem.annotationItem: MvElement
-    get() {
-        val parent = this.parent
-        if (parent is MvUseItemGroup && parent.useItemList.size != 1) return this
-        return useStmt
-    }
-
-val MvUseItem.useStmt: MvUseStmt
-    get() =
-        ancestorStrict() ?: error("always has MvUseStmt as ancestor")
-
-val MvUseItem.nameOrAlias: String?
-    get() {
-        val alias = this.useAlias
-        if (alias != null) {
-            return alias.identifier?.text
-        }
-        return this.identifier.text
-    }
-
-val MvUseItem.moduleName: String
-    get() {
-        val useStmt = this.ancestorStrict<MvUseStmt>()
-        return useStmt?.itemUseSpeck?.fqModuleRef?.referenceName.orEmpty()
-    }
-
-val MvUseItem.isSelf: Boolean get() = this.identifier.textMatches("Self")
-
-class MvUseItemReferenceElement(
-    element: MvUseItem
-): MvPolyVariantReferenceCached<MvUseItem>(element) {
-
-    override fun multiResolveInner(): List<MvNamedElement> {
-        val fqModuleRef = element.itemUseSpeck.fqModuleRef
-        val module =
-            fqModuleRef.reference?.resolve() as? MvModule ?: return emptyList()
-        if ((element.useAlias == null && element.text == "Self")
-            || (element.useAlias != null && element.text.startsWith("Self as"))
-        ) {
-            return listOf(module)
-        }
-
-        val ns = setOf(
-            Namespace.TYPE,
-            Namespace.NAME,
-            Namespace.FUNCTION,
-            Namespace.SCHEMA,
-            Namespace.CONST
-        )
-        val vs = Visibility.visibilityScopesForElement(fqModuleRef)
-
-        // import has MAIN+VERIFY, and TEST if it or any of the parents has test
-        val useItemScopes = mutableSetOf(NamedItemScope.MAIN, NamedItemScope.VERIFY)
-
-        // gather scopes for all parents up to MvUseStmt
-        var scopedElement: MvElement? = element
-        while (scopedElement != null) {
-            useItemScopes.addAll(scopedElement.itemScopes)
-            scopedElement = scopedElement.parent as? MvElement
-        }
-
-        val contextScopeInfo =
-            ContextScopeInfo(
-                letStmtScope = LetStmtScope.EXPR_STMT,
-                refItemScopes = useItemScopes,
-            )
-        return resolveModuleItem(
-            module,
-            element.referenceName,
-            ns,
-            vs,
-            contextScopeInfo
-        )
-    }
-
-}
-
-abstract class MvUseItemMixin(node: ASTNode): MvNamedElementImpl(node),
-                                              MvUseItem {
-    override fun getName(): String? {
-        val name = super.getName()
-        if (name != "Self") return name
-        return ancestorStrict<MvItemUseSpeck>()?.fqModuleRef?.referenceName ?: name
-    }
-
-    override val referenceNameElement: PsiElement get() = identifier
-
-    override fun getReference() = MvUseItemReferenceElement(this)
-}
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseItemGroup.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseItemGroup.kt
deleted file mode 100644
index f6b2ccb1e..000000000
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseItemGroup.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.move.lang.core.psi.ext
-
-import com.intellij.psi.PsiComment
-import com.intellij.psi.SyntaxTraverser
-import org.move.lang.core.psi.MvItemUseSpeck
-import org.move.lang.core.psi.MvUseItem
-import org.move.lang.core.psi.MvUseItemGroup
-
-val MvUseItemGroup.names get() = this.useItemList.mapNotNull { it.identifier.text }
-
-val MvUseItemGroup.parentUseSpeck: MvItemUseSpeck get() = parent as MvItemUseSpeck
-
-val MvUseItemGroup.asTrivial: MvUseItem?
-    get() {
-        val speck = useItemList.singleOrNull() ?: return null
-        // Do not change use-groups with comments
-        if (SyntaxTraverser.psiTraverser(this).traverse().any { it is PsiComment }) return null
-        return speck
-    }
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseSpeck.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseSpeck.kt
new file mode 100644
index 000000000..c022248d4
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseSpeck.kt
@@ -0,0 +1,11 @@
+package org.move.lang.core.psi.ext
+
+import org.move.lang.core.psi.MvPath
+import org.move.lang.core.psi.MvUseGroup
+import org.move.lang.core.psi.MvUseSpeck
+
+val MvUseSpeck.qualifier: MvPath? get() {
+    val parentUseSpeck = (context as? MvUseGroup)?.parentUseSpeck ?: return null
+    return parentUseSpeck.path
+}
+val MvUseSpeck.isSelf: Boolean get() = this.path.identifier?.textMatches("Self") ?: false
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseStmt.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvUseStmt.kt
deleted file mode 100644
index f6d635318..000000000
--- a/src/main/kotlin/org/move/lang/core/psi/ext/MvUseStmt.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.move.lang.core.psi.ext
-
-import org.move.ide.inspections.imports.declaredItemScope
-import org.move.lang.core.psi.*
-import org.move.stdext.wrapWithList
-
-val MvUseStmt.addressRef: MvAddressRef?
-    get() {
-        val moduleUseSpeck = this.moduleUseSpeck
-        if (moduleUseSpeck != null) {
-            val fqModuleRef = moduleUseSpeck.fqModuleRef
-            if (fqModuleRef != null) {
-                return fqModuleRef.addressRef
-            } else {
-                return moduleUseSpeck.addressRef
-            }
-        }
-        val itemUseSpeck = this.itemUseSpeck
-        if (itemUseSpeck != null) {
-            return itemUseSpeck.fqModuleRef.addressRef
-        }
-        return null
-    }
-
-val MvUseStmt.useGroupLevel: Int
-    get() {
-        if (this.hasTestOnlyAttr) return 5
-        return this.addressRef?.useGroupLevel ?: -1
-    }
-
-val MvUseStmt.fqModuleText: String?
-    get() {
-        val fqModuleRef = this.fqModuleRef ?: return null
-        return fqModuleRef.text
-    }
-
-val MvUseStmt.fqModuleRef: MvFQModuleRef?
-    get() {
-        val moduleUseSpeck = this.moduleUseSpeck
-        if (moduleUseSpeck != null) {
-            return moduleUseSpeck.fqModuleRef
-        }
-        val itemUseSpeck = this.itemUseSpeck
-        if (itemUseSpeck != null) {
-            return itemUseSpeck.fqModuleRef
-        }
-        return null
-    }
-
-val MvUseStmt.childUseItems: List<MvUseItem>
-    get() {
-        return this.itemUseSpeck?.useItems.orEmpty()
-//        if (itemUseSpeck != null) {
-//            return itemUseSpeck.useItems
-////            val group = itemUseSpeck.useItemGroup
-////            if (group != null) {
-////                return group.useItemList
-////            }
-////            return itemUseSpeck.useItem.wrapWithList()
-//        }
-//        return emptyList()
-    }
-
-val MvItemUseSpeck.useItems: List<MvUseItem>
-    get() {
-        val group = this.useItemGroup
-        if (group != null) {
-            return group.useItemList
-        }
-        return this.useItem.wrapWithList()
-    }
-
-sealed class UseSpeck(open val nameOrAlias: String, open val scope: NamedItemScope) {
-    data class Module(
-        override val nameOrAlias: String,
-        override val scope: NamedItemScope,
-        val moduleUseSpeck: MvModuleUseSpeck,
-    ): UseSpeck(nameOrAlias, scope)
-
-    data class SelfModule(
-        override val nameOrAlias: String,
-        override val scope: NamedItemScope,
-        val useItem: MvUseItem,
-    ): UseSpeck(nameOrAlias, scope)
-
-    data class Item(
-        override val nameOrAlias: String,
-        override val scope: NamedItemScope,
-        val useItem: MvUseItem,
-    ): UseSpeck(nameOrAlias, scope)
-}
-
-val MvUseStmt.useSpecks: List<UseSpeck>
-    get() {
-        val stmtItemScope = this.declaredItemScope
-        val moduleUseSpeck = this.moduleUseSpeck
-        if (moduleUseSpeck != null) {
-            val nameOrAlias = moduleUseSpeck.nameElement?.text ?: return emptyList()
-            return listOf(UseSpeck.Module(nameOrAlias, stmtItemScope, moduleUseSpeck))
-        }
-        return this.itemUseSpeck?.useItems.orEmpty()
-            .mapNotNull {
-                if (it.isSelf) {
-                    val useAlias = it.useAlias
-                    val nameOrAlias =
-                        if (useAlias != null) {
-                            val aliasName = useAlias.name ?: return@mapNotNull null
-                            aliasName
-                        } else {
-                            it.moduleName
-                        }
-                    UseSpeck.SelfModule(nameOrAlias, stmtItemScope, it)
-                } else {
-                    val nameOrAlias = it.nameOrAlias ?: return@mapNotNull null
-                    UseSpeck.Item(nameOrAlias, stmtItemScope, it)
-                }
-            }
-    }
-
-val MvUseStmt.useSpeckText: String
-    get() {
-        val moduleUseSpeck = this.moduleUseSpeck
-        if (moduleUseSpeck != null) {
-            return moduleUseSpeck.text
-        }
-        val itemUseSpeck = this.itemUseSpeck
-        if (itemUseSpeck != null) {
-            return itemUseSpeck.text
-        }
-        return ""
-    }
diff --git a/src/main/kotlin/org/move/lang/core/psi/ext/MvVisibilityOwner.kt b/src/main/kotlin/org/move/lang/core/psi/ext/MvVisibilityOwner.kt
new file mode 100644
index 000000000..f8b9e426f
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/psi/ext/MvVisibilityOwner.kt
@@ -0,0 +1,55 @@
+package org.move.lang.core.psi.ext
+
+import com.intellij.psi.util.PsiTreeUtil
+import org.move.cli.containingMovePackage
+import org.move.lang.core.psi.MvElement
+import org.move.lang.core.psi.MvVisibilityModifier
+import org.move.lang.core.psi.containingModule
+import org.move.lang.core.psi.ext.VisKind.*
+import org.move.lang.core.resolve.ref.Visibility2
+
+interface MvVisibilityOwner: MvElement {
+    val visibilityModifier: MvVisibilityModifier?
+        get() = PsiTreeUtil.getStubChildOfType(this, MvVisibilityModifier::class.java)
+
+    // restricted visibility considered as public
+    val isPublic: Boolean get() = visibilityModifier != null
+}
+
+// todo: add VisibilityModifier to stubs, rename this one to VisStubKind
+enum class VisKind {
+    //    PRIVATE,
+    PUBLIC,
+    FRIEND,
+    PACKAGE,
+    SCRIPT;
+}
+
+val MvVisibilityModifier.stubKind: VisKind
+    get() = when {
+        this.isPublicFriend -> FRIEND
+        this.isPublicPackage -> PACKAGE
+        this.isPublicScript -> SCRIPT
+        this.isPublic -> PUBLIC
+        else -> error("unreachable")
+    }
+
+val MvVisibilityOwner.visibility2: Visibility2
+    get() {
+        val kind = this.visibilityModifier?.stubKind ?: return Visibility2.Private
+
+        return when (kind) {
+            PACKAGE -> containingMovePackage?.let { Visibility2.Restricted.Package(it) } ?: Visibility2.Public
+            FRIEND -> {
+                val module = this.containingModule ?: return Visibility2.Private
+                // todo: make lazy
+                Visibility2.Restricted.Friend(lazy { module.friendModules })
+            }
+            SCRIPT -> Visibility2.Restricted.Script
+            PUBLIC -> Visibility2.Public
+        }
+    }
+
+
+
+
diff --git a/src/main/kotlin/org/move/lang/core/resolve/MatchingProcessor.kt b/src/main/kotlin/org/move/lang/core/resolve/MatchingProcessor.kt
index a2fa79305..5e0d69ee1 100644
--- a/src/main/kotlin/org/move/lang/core/resolve/MatchingProcessor.kt
+++ b/src/main/kotlin/org/move/lang/core/resolve/MatchingProcessor.kt
@@ -1,41 +1,8 @@
 package org.move.lang.core.resolve
 
 import org.move.lang.core.psi.MvNamedElement
-import org.move.lang.core.psi.ext.isMslOnlyItem
-import org.move.lang.core.psi.isVisibleInContext
 
 data class ScopeItem<T: MvNamedElement>(
     val name: String,
     val element: T
 )
-
-fun interface MatchingProcessor<T: MvNamedElement> {
-    fun match(entry: ScopeItem<T>): Boolean
-
-    fun match(itemElement: T): Boolean {
-        val name = itemElement.name ?: return false
-        val entry = ScopeItem(name, itemElement)
-        return match(entry)
-    }
-
-    fun match(contextScopeInfo: ContextScopeInfo, itemElement: T): Boolean {
-        if (
-            !contextScopeInfo.isMslScope && itemElement.isMslOnlyItem
-        ) return false
-        if (!itemElement.isVisibleInContext(contextScopeInfo.refItemScopes)) return false
-
-        val name = itemElement.name ?: return false
-        val entry = ScopeItem(name, itemElement)
-        return match(entry)
-    }
-
-    fun matchAll(contextScopeInfo: ContextScopeInfo, vararg collections: Iterable<T>): Boolean =
-        sequenceOf(*collections)
-            .flatten()
-            .any { match(contextScopeInfo, it) }
-
-    fun matchAll(vararg collections: Iterable<T>): Boolean =
-        sequenceOf(*collections)
-            .flatten()
-            .any { match(it) }
-}
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ModuleItemResolution.kt b/src/main/kotlin/org/move/lang/core/resolve/ModuleItemResolution.kt
deleted file mode 100644
index 6b79a1eba..000000000
--- a/src/main/kotlin/org/move/lang/core/resolve/ModuleItemResolution.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.move.lang.core.resolve
-
-import org.move.lang.core.psi.MvModule
-import org.move.lang.core.psi.MvNamedElement
-import org.move.lang.core.psi.ext.*
-import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
-
-fun processModuleInnerItems(
-    module: MvModule,
-    namespaces: Set<Namespace>,
-    visibilities: Set<Visibility>,
-    contextScopeInfo: ContextScopeInfo,
-    processor: MatchingProcessor<MvNamedElement>,
-): Boolean {
-    for (namespace in namespaces) {
-        val found = when (namespace) {
-            Namespace.NAME -> {
-                processor.matchAll(
-                    contextScopeInfo,
-                    if (contextScopeInfo.isMslScope) module.consts() else emptyList(),
-                    if (contextScopeInfo.isMslScope) module.structs() else emptyList(),
-                    if (contextScopeInfo.isMslScope)
-                        module.allModuleSpecs()
-                            .map {
-                                it.moduleItemSpecs()
-                                    .flatMap { spec -> spec.itemSpecBlock?.globalVariables().orEmpty() }
-                            }
-                            .flatten()
-                    else emptyList()
-                )
-            }
-            Namespace.FUNCTION -> {
-                val functions = visibilities.flatMap { module.functionsVisibleInScope(it) }
-                val specFunctions =
-                    if (contextScopeInfo.isMslScope) module.specFunctions() else emptyList()
-                val specInlineFunctions =
-                    if (contextScopeInfo.isMslScope) module.specInlineFunctions() else emptyList()
-                processor.matchAll(
-                    contextScopeInfo,
-                    functions, specFunctions, specInlineFunctions
-                )
-            }
-            Namespace.TYPE -> processor.matchAll(contextScopeInfo, module.structs())
-            Namespace.SCHEMA -> processor.matchAll(contextScopeInfo, module.schemas())
-            Namespace.CONST -> processor.matchAll(contextScopeInfo, module.consts())
-            else -> continue
-        }
-        if (found) return true
-    }
-    return false
-}
-
-fun processModuleSpecItems(
-    module: MvModule,
-    namespaces: Set<Namespace>,
-    contextScopeInfo: ContextScopeInfo,
-    processor: MatchingProcessor<MvNamedElement>,
-): Boolean {
-    for (namespace in namespaces) {
-        for (moduleSpec in module.allModuleSpecs()) {
-            val matched = when (namespace) {
-                Namespace.FUNCTION ->
-                    processor.matchAll(
-                        contextScopeInfo,
-                        moduleSpec.specFunctions(),
-                        moduleSpec.specInlineFunctions()
-                    )
-                Namespace.SCHEMA -> processor.matchAll(contextScopeInfo, moduleSpec.schemas())
-                else -> false
-            }
-            if (matched) return true
-        }
-    }
-    return false
-}
-
-fun processModuleItems(
-    module: MvModule,
-    namespaces: Set<Namespace>,
-    visibilities: Set<Visibility>,
-    contextScopeInfo: ContextScopeInfo,
-    processor: MatchingProcessor<MvNamedElement>,
-): Boolean {
-    return processModuleInnerItems(module, namespaces, visibilities, contextScopeInfo, processor)
-            ||
-            contextScopeInfo.isMslScope && processModuleSpecItems(module, namespaces, contextScopeInfo, processor)
-}
-
-fun resolveModuleItem(
-    module: MvModule,
-    name: String,
-    namespaces: Set<Namespace>,
-    visibilities: Set<Visibility>,
-    contextScopeInfo: ContextScopeInfo,
-): List<MvNamedElement> {
-    val resolved = mutableListOf<MvNamedElement>()
-    processModuleItems(module, namespaces, visibilities, contextScopeInfo) {
-        if (it.name == name) {
-            resolved.add(it.element)
-            return@processModuleItems true
-        }
-        return@processModuleItems false
-    }
-    return resolved
-}
diff --git a/src/main/kotlin/org/move/lang/core/resolve/NameResolution.kt b/src/main/kotlin/org/move/lang/core/resolve/NameResolution.kt
deleted file mode 100644
index 3f3cbe4ec..000000000
--- a/src/main/kotlin/org/move/lang/core/resolve/NameResolution.kt
+++ /dev/null
@@ -1,297 +0,0 @@
-package org.move.lang.core.resolve
-
-import com.intellij.psi.search.GlobalSearchScope
-import org.move.cli.containingMovePackage
-import org.move.cli.settings.moveSettings
-import org.move.lang.MoveFile
-import org.move.lang.core.psi.*
-import org.move.lang.core.psi.NamedItemScope.MAIN
-import org.move.lang.core.psi.NamedItemScope.VERIFY
-import org.move.lang.core.psi.ext.*
-import org.move.lang.core.resolve.LetStmtScope.EXPR_STMT
-import org.move.lang.core.resolve.LetStmtScope.NONE
-import org.move.lang.core.resolve.ref.MvReferenceElement
-import org.move.lang.core.resolve.ref.Namespace
-import org.move.lang.core.resolve.ref.Visibility
-import org.move.lang.core.types.address
-import org.move.lang.index.MvNamedElementIndex
-import org.move.lang.moveProject
-import org.move.lang.toNioPathOrNull
-import org.move.stdext.wrapWithList
-
-data class ContextScopeInfo(
-    val refItemScopes: Set<NamedItemScope>,
-    val letStmtScope: LetStmtScope,
-) {
-    val isMslScope get() = letStmtScope != LetStmtScope.NONE
-
-    fun matches(itemElement: MvNamedElement): Boolean {
-        if (
-            !this.isMslScope && itemElement.isMslOnlyItem
-        ) return false
-        if (!itemElement.isVisibleInContext(this.refItemScopes)) return false
-        return true
-    }
-
-    companion object {
-        /// really does not affect anything, created just to allow creating CompletionContext everywhere
-        fun default(): ContextScopeInfo = ContextScopeInfo(setOf(MAIN), NONE)
-        fun msl(): ContextScopeInfo = ContextScopeInfo(setOf(VERIFY), EXPR_STMT)
-    }
-}
-
-fun processItems(
-    element: MvElement,
-    namespaces: Set<Namespace>,
-    contextScopeInfo: ContextScopeInfo,
-    processor: MatchingProcessor<MvNamedElement>,
-): Boolean {
-    return walkUpThroughScopes(
-        element,
-        stopAfter = { it is MvModule }
-    ) { cameFrom, scope ->
-        processItemsInScope(
-            scope, cameFrom, namespaces, contextScopeInfo, processor
-        )
-    }
-}
-
-fun resolveLocalItem(
-    element: MvReferenceElement,
-    namespaces: Set<Namespace>
-): List<MvNamedElement> {
-    val contextScopeInfo =
-        ContextScopeInfo(
-            letStmtScope = element.letStmtScope,
-            refItemScopes = element.refItemScopes,
-        )
-    val referenceName = element.referenceName
-    var resolved: MvNamedElement? = null
-    processItems(element, namespaces, contextScopeInfo) {
-        if (it.name == referenceName) {
-            resolved = it.element
-            return@processItems true
-        }
-        return@processItems false
-    }
-    return resolved.wrapWithList()
-}
-
-// go from local MODULE reference to corresponding FqModuleRef (from import)
-fun resolveIntoFQModuleRefInUseSpeck(moduleRef: MvModuleRef): MvFQModuleRef? {
-    check(moduleRef !is MvFQModuleRef) { "Should be handled on the upper level" }
-
-    // module refers to ModuleImport
-    var resolved = resolveLocalItem(moduleRef, setOf(Namespace.MODULE)).firstOrNull()
-    if (resolved is MvUseAlias) {
-        resolved = resolved.moduleUseSpeck ?: resolved.useItem
-    }
-    if (resolved is MvUseItem && resolved.isSelf) {
-        return resolved.itemUseSpeck.fqModuleRef
-    }
-//    if (resolved !is MvModuleUseSpeck) return null
-    return (resolved as? MvModuleUseSpeck)?.fqModuleRef
-//    return resolved.fqModuleRef
-}
-
-fun processQualItem(
-    item: MvNamedElement,
-    namespaces: Set<Namespace>,
-    visibilities: Set<Visibility>,
-    contextScopeInfo: ContextScopeInfo,
-    processor: MatchingProcessor<MvNamedElement>,
-): Boolean {
-    val matched = when {
-        item is MvModule && Namespace.MODULE in namespaces
-                || item is MvStruct && Namespace.TYPE in namespaces
-                || item is MvSchema && Namespace.SCHEMA in namespaces ->
-            processor.match(contextScopeInfo, item)
-
-        item is MvFunction && Namespace.FUNCTION in namespaces -> {
-            if (item.hasTestAttr) return false
-            for (vis in visibilities) {
-                when {
-                    vis is Visibility.Public
-                            && item.visibility == FunctionVisibility.PUBLIC -> processor.match(
-                        contextScopeInfo,
-                        item
-                    )
-
-                    vis is Visibility.PublicScript
-                            && item.visibility == FunctionVisibility.PUBLIC_SCRIPT ->
-                        processor.match(contextScopeInfo, item)
-
-                    vis is Visibility.PublicFriend && item.visibility == FunctionVisibility.PUBLIC_FRIEND -> {
-                        val itemModule = item.module ?: return false
-                        val currentModule = vis.currentModule.element ?: return false
-                        if (currentModule.fqModule() in itemModule.declaredFriendModules) {
-                            processor.match(contextScopeInfo, item)
-                        }
-                    }
-
-                    vis is Visibility.PublicPackage && item.visibility == FunctionVisibility.PUBLIC_PACKAGE -> {
-                        if (!item.project.moveSettings.enablePublicPackage) {
-                            return false
-                        }
-                        val itemPackage = item.containingMovePackage ?: return false
-                        if (vis.originPackage == itemPackage) {
-                            processor.match(contextScopeInfo, item)
-                        }
-                    }
-
-                    vis is Visibility.Internal -> processor.match(contextScopeInfo, item)
-                }
-            }
-            false
-        }
-        else -> false
-    }
-    return matched
-}
-
-fun processModulesInFile(file: MoveFile, moduleProcessor: MatchingProcessor<MvNamedElement>): Boolean {
-    for (module in file.modules()) {
-        if (moduleProcessor.match(module)) return true
-    }
-    return false
-}
-
-fun processFQModuleRef(
-    fqModuleRef: MvFQModuleRef,
-    processor: MatchingProcessor<MvModule>,
-) {
-    val moveProj = fqModuleRef.moveProject ?: return
-    val refAddressText = fqModuleRef.addressRef.address(moveProj)?.canonicalValue(moveProj)
-
-    val contextScopeInfo = ContextScopeInfo(
-        letStmtScope = fqModuleRef.letStmtScope,
-        refItemScopes = fqModuleRef.refItemScopes,
-    )
-    val moduleProcessor = MatchingProcessor {
-        if (!contextScopeInfo.matches(it.element)) {
-            return@MatchingProcessor false
-        }
-        val entry = ScopeItem(it.name, it.element as MvModule)
-        val modAddressText = entry.element.address(moveProj)?.canonicalValue(moveProj)
-        if (modAddressText != refAddressText)
-            return@MatchingProcessor false
-        processor.match(entry)
-    }
-
-    // first search modules in the current file
-    val currentFile = fqModuleRef.containingMoveFile ?: return
-    var stopped = processModulesInFile(currentFile, moduleProcessor)
-//    var stopped =
-//        processFileItems(currentFile, setOf(Namespace.MODULE), Visibility.local(), itemVis, moduleProcessor)
-    if (stopped) return
-
-    moveProj.processMoveFiles { moveFile ->
-        // skip current file as it's processed already
-        if (moveFile.toNioPathOrNull() == currentFile.toNioPathOrNull())
-            return@processMoveFiles true
-        stopped = processModulesInFile(moveFile, moduleProcessor)
-        // if not resolved, returns true to indicate that next file should be tried
-        !stopped
-    }
-}
-
-fun processFQModuleRef(
-    moduleRef: MvFQModuleRef,
-    target: String,
-    processor: MatchingProcessor<MvModule>,
-) {
-    val project = moduleRef.project
-    val moveProj = moduleRef.moveProject ?: return
-    val refAddress = moduleRef.addressRef.address(moveProj)?.canonicalValue(moveProj)
-
-    val contextScopeInfo = ContextScopeInfo(
-        letStmtScope = moduleRef.letStmtScope,
-        refItemScopes = moduleRef.refItemScopes,
-    )
-    val matchModule = MatchingProcessor {
-        if (!contextScopeInfo.matches(it.element)) return@MatchingProcessor false
-        val entry = ScopeItem(it.name, it.element as MvModule)
-        // TODO: check belongs to the current project
-        val modAddress = entry.element.address(moveProj)?.canonicalValue(moveProj)
-
-        if (modAddress != refAddress) return@MatchingProcessor false
-        processor.match(entry)
-    }
-
-
-    // search modules in the current file first
-    val currentFile = moduleRef.containingMoveFile ?: return
-    val stopped = processModulesInFile(currentFile, matchModule)
-//        processFileItems(currentFile, setOf(Namespace.MODULE), Visibility.local(), itemVis, matchModule)
-    if (stopped) return
-
-    val currentFileScope = GlobalSearchScope.fileScope(currentFile)
-    val searchScope =
-        moveProj.searchScope().intersectWith(GlobalSearchScope.notScope(currentFileScope))
-
-    MvNamedElementIndex
-        .processElementsByName(project, target, searchScope) {
-            val matched =
-                processQualItem(it, setOf(Namespace.MODULE), Visibility.local(), contextScopeInfo, matchModule)
-            if (matched) return@processElementsByName false
-
-            true
-        }
-}
-
-fun walkUpThroughScopes(
-    start: MvElement,
-    stopAfter: (MvElement) -> Boolean,
-    handleScope: (cameFrom: MvElement, scope: MvElement) -> Boolean,
-): Boolean {
-    var cameFrom = start
-    var scope = start.context as MvElement?
-    while (scope != null) {
-        if (handleScope(cameFrom, scope)) return true
-
-        // walk all items in original module block
-        if (scope is MvModuleBlock) {
-            // handle spec module {}
-            if (handleModuleItemSpecsInBlock(cameFrom, scope, handleScope)) return true
-            // walk over all spec modules
-            for (moduleSpec in scope.module.allModuleSpecs()) {
-                val moduleSpecBlock = moduleSpec.moduleSpecBlock ?: continue
-                if (handleScope(cameFrom, moduleSpecBlock)) return true
-                if (handleModuleItemSpecsInBlock(cameFrom, moduleSpecBlock, handleScope)) return true
-            }
-        }
-
-        if (scope is MvModuleSpecBlock) {
-            val moduleBlock = scope.moduleSpec.moduleItem?.moduleBlock
-            if (moduleBlock != null) {
-                cameFrom = scope
-                scope = moduleBlock
-                continue
-            }
-        }
-
-        if (stopAfter(scope)) break
-
-        cameFrom = scope
-        scope = scope.context as? MvElement
-    }
-
-    return false
-}
-
-private fun handleModuleItemSpecsInBlock(
-    cameFrom: MvElement,
-    block: MvElement,
-    handleScope: (cameFrom: MvElement, scope: MvElement) -> Boolean
-): Boolean {
-    val moduleItemSpecs = when (block) {
-        is MvModuleBlock -> block.moduleItemSpecList
-        is MvModuleSpecBlock -> block.moduleItemSpecList
-        else -> emptyList()
-    }
-    for (moduleItemSpec in moduleItemSpecs.filter { it != cameFrom }) {
-        val itemSpecBlock = moduleItemSpec.itemSpecBlock ?: continue
-        if (handleScope(cameFrom, itemSpecBlock)) return true
-    }
-    return false
-}
diff --git a/src/main/kotlin/org/move/lang/core/resolve/Processors.kt b/src/main/kotlin/org/move/lang/core/resolve/Processors.kt
new file mode 100644
index 000000000..92917afcc
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve/Processors.kt
@@ -0,0 +1,578 @@
+package org.move.lang.core.resolve
+
+import com.intellij.codeInsight.completion.CompletionResultSet
+import com.intellij.util.SmartList
+import org.move.lang.core.completion.CompletionContext
+import org.move.lang.core.completion.createLookupElement
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.ext.MvItemElement
+import org.move.lang.core.psi.ext.MvMethodOrPath
+import org.move.lang.core.resolve.VisibilityStatus.Visible
+import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.resolve2.createFilter
+import org.move.lang.core.resolve2.ref.ResolutionContext
+import org.move.lang.core.resolve2.ref.RsPathResolveResult
+import org.move.lang.core.resolve2.visInfo
+import org.move.stdext.intersects
+
+/**
+ * ScopeEntry is some PsiElement visible in some code scope.
+ *
+ * [SimpleScopeEntry] handles the two cases:
+ *   * aliases (that's why we need a [name] property)
+ *   * lazy resolving of actual elements (that's why [element] can return `null`) - unused for now
+ */
+interface ScopeEntry {
+    val name: String
+    val element: MvNamedElement
+    val namespaces: Set<Namespace>
+    fun doCopyWithNs(namespaces: Set<Namespace>): ScopeEntry
+}
+
+@Suppress("UNCHECKED_CAST")
+private fun <T: ScopeEntry> T.copyWithNs(namespaces: Set<Namespace>): T = doCopyWithNs(namespaces) as T
+
+typealias RsProcessor<T> = (T) -> Boolean
+
+interface RsResolveProcessorBase<in T: ScopeEntry> {
+    /**
+     * Return `true` to stop further processing,
+     * return `false` to continue search
+     */
+    fun process(entry: T): Boolean
+
+    /**
+     * Indicates that processor is interested only in [ScopeEntry]s with specified [names].
+     * Improves performance for Resolve2.
+     * `null` in completion
+     */
+    val names: Set<String>?
+
+    fun acceptsName(name: String): Boolean {
+        val names = names
+        return names == null || name in names
+    }
+}
+
+//interface RsResolveProcessor {
+//    /**
+//     * Return `true` to stop further processing,
+//     * return `false` to continue search
+//     */
+//    fun process(entry: SimpleScopeEntry): Boolean
+//
+//    /**
+//     * Indicates that processor is interested only in [SimpleScopeEntry]s with specified [names].
+//     * Improves performance for Resolve2.
+//     * `null` in completion
+//     */
+//    val names: Set<String>?
+//
+//    fun acceptsName(name: String): Boolean {
+//        val names = names
+//        return names == null || name in names
+//    }
+//}
+
+typealias RsResolveProcessor = RsResolveProcessorBase<ScopeEntry>
+
+fun createStoppableProcessor(processor: (ScopeEntry) -> Boolean): RsResolveProcessor {
+    return object: RsResolveProcessorBase<ScopeEntry> {
+        override fun process(entry: ScopeEntry): Boolean = processor(entry)
+        override val names: Set<String>? get() = null
+    }
+}
+
+fun createProcessor(processor: (ScopeEntry) -> Unit): RsResolveProcessor {
+    return object: RsResolveProcessorBase<ScopeEntry> {
+        override fun process(entry: ScopeEntry): Boolean {
+            processor(entry)
+            return false
+        }
+
+        override val names: Set<String>? get() = null
+    }
+}
+
+fun <T: ScopeEntry, U: ScopeEntry> RsResolveProcessorBase<T>.wrapWithMapper(
+    mapper: (U) -> T
+): RsResolveProcessorBase<U> {
+    return MappingProcessor(this, mapper)
+}
+
+private class MappingProcessor<in T: ScopeEntry, in U: ScopeEntry>(
+    private val originalProcessor: RsResolveProcessorBase<T>,
+    private val mapper: (U) -> T,
+): RsResolveProcessorBase<U> {
+    override val names: Set<String>? = originalProcessor.names
+    override fun process(entry: U): Boolean {
+        val mapped = mapper(entry)
+        return originalProcessor.process(mapped)
+    }
+
+    override fun toString(): String = "MappingProcessor($originalProcessor, mapper = $mapper)"
+}
+
+fun <T: ScopeEntry, U: ScopeEntry> RsResolveProcessorBase<T>.wrapWithNonNullMapper(
+    mapper: (U) -> T?
+): RsResolveProcessorBase<U> {
+    return NonNullMappingProcessor(this, mapper)
+}
+
+private class NonNullMappingProcessor<in T: ScopeEntry, in U: ScopeEntry>(
+    private val originalProcessor: RsResolveProcessorBase<T>,
+    private val mapper: (U) -> T?,
+): RsResolveProcessorBase<U> {
+    override val names: Set<String>? = originalProcessor.names
+    override fun process(entry: U): Boolean {
+        val mapped = mapper(entry)
+        return if (mapped == null) {
+            false
+        } else {
+            originalProcessor.process(mapped)
+        }
+    }
+
+    override fun toString(): String = "MappingProcessor($originalProcessor, mapper = $mapper)"
+}
+
+fun <T: ScopeEntry> RsResolveProcessorBase<T>.wrapWithFilter(
+    filter: (T) -> Boolean
+): RsResolveProcessorBase<T> {
+    return FilteringProcessor(this, filter)
+}
+
+private class FilteringProcessor<in T: ScopeEntry>(
+    private val originalProcessor: RsResolveProcessorBase<T>,
+    private val filter: (T) -> Boolean,
+): RsResolveProcessorBase<T> {
+    override val names: Set<String>? = originalProcessor.names
+    override fun process(entry: T): Boolean {
+        return if (filter(entry)) {
+            originalProcessor.process(entry)
+        } else {
+            false
+        }
+    }
+
+    override fun toString(): String = "FilteringProcessor($originalProcessor, filter = $filter)"
+}
+
+fun <T: ScopeEntry> RsResolveProcessorBase<T>.wrapWithBeforeProcessingHandler(
+    handler: (T) -> Unit
+): RsResolveProcessorBase<T> {
+    return BeforeProcessingProcessor(this, handler)
+}
+
+private class BeforeProcessingProcessor<in T: ScopeEntry>(
+    private val originalProcessor: RsResolveProcessorBase<T>,
+    private val handler: (T) -> Unit,
+): RsResolveProcessorBase<T> {
+    override val names: Set<String>? = originalProcessor.names
+    override fun process(entry: T): Boolean {
+        handler(entry)
+        return originalProcessor.process(entry)
+    }
+
+    override fun toString(): String = "BeforeProcessingProcessor($originalProcessor, handler = $handler)"
+}
+
+
+fun <T: ScopeEntry> RsResolveProcessorBase<T>.wrapWithShadowingProcessor(
+    prevScope: Map<String, Set<Namespace>>,
+    ns: Set<Namespace>,
+): RsResolveProcessorBase<T> {
+    return ShadowingProcessor(this, prevScope, ns)
+}
+
+private class ShadowingProcessor<in T: ScopeEntry>(
+    private val originalProcessor: RsResolveProcessorBase<T>,
+    private val prevScope: Map<String, Set<Namespace>>,
+    private val ns: Set<Namespace>,
+): RsResolveProcessorBase<T> {
+    override val names: Set<String>? = originalProcessor.names
+    override fun process(entry: T): Boolean {
+        val prevNs = prevScope[entry.name]
+        if (entry.name == "_" || prevNs == null) return originalProcessor.process(entry)
+        val restNs = entry.namespaces.minus(prevNs)
+        return ns.intersects(restNs) && originalProcessor.process(entry.copyWithNs(restNs))
+    }
+
+    override fun toString(): String = "ShadowingProcessor($originalProcessor, ns = $ns)"
+}
+
+fun <T: ScopeEntry> RsResolveProcessorBase<T>.wrapWithShadowingProcessorAndUpdateScope(
+    prevScope: Map<String, Set<Namespace>>,
+    currScope: MutableMap<String, Set<Namespace>>,
+    ns: Set<Namespace>,
+): RsResolveProcessorBase<T> {
+    return ShadowingAndUpdateScopeProcessor(this, prevScope, currScope, ns)
+}
+
+private class ShadowingAndUpdateScopeProcessor<in T: ScopeEntry>(
+    private val originalProcessor: RsResolveProcessorBase<T>,
+    private val prevScope: Map<String, Set<Namespace>>,
+    private val currScope: MutableMap<String, Set<Namespace>>,
+    private val ns: Set<Namespace>,
+): RsResolveProcessorBase<T> {
+    override val names: Set<String>? = originalProcessor.names
+    override fun process(entry: T): Boolean {
+        if (!originalProcessor.acceptsName(entry.name) || entry.name == "_") {
+            return originalProcessor.process(entry)
+        }
+        val prevNs = prevScope[entry.name]
+        val newNs = entry.namespaces
+        val entryWithIntersectedNs = if (prevNs != null) {
+            val restNs = newNs.minus(prevNs)
+            if (ns.intersects(restNs)) {
+                entry.copyWithNs(restNs)
+            } else {
+                return false
+            }
+        } else {
+            entry
+        }
+        currScope[entry.name] = prevNs?.let { it + newNs } ?: newNs
+        return originalProcessor.process(entryWithIntersectedNs)
+    }
+
+    override fun toString(): String = "ShadowingAndUpdateScopeProcessor($originalProcessor, ns = $ns)"
+}
+
+fun <T: ScopeEntry> RsResolveProcessorBase<T>.wrapWithShadowingProcessorAndImmediatelyUpdateScope(
+    prevScope: MutableMap<String, Set<Namespace>>,
+    ns: Set<Namespace>,
+): RsResolveProcessorBase<T> {
+    return ShadowingAndImmediatelyUpdateScopeProcessor(this, prevScope, ns)
+}
+
+private class ShadowingAndImmediatelyUpdateScopeProcessor<in T: ScopeEntry>(
+    private val originalProcessor: RsResolveProcessorBase<T>,
+    private val prevScope: MutableMap<String, Set<Namespace>>,
+    private val ns: Set<Namespace>,
+): RsResolveProcessorBase<T> {
+    override val names: Set<String>? = originalProcessor.names
+    override fun process(entry: T): Boolean {
+        if (entry.name in prevScope) return false
+        val result = originalProcessor.process(entry)
+        if (originalProcessor.acceptsName(entry.name)) {
+            prevScope[entry.name] = ns
+        }
+        return result
+    }
+
+    override fun toString(): String =
+        "ShadowingAndImmediatelyUpdateScopeProcessor($originalProcessor, ns = $ns)"
+}
+
+fun collectResolveVariants(referenceName: String?, f: (RsResolveProcessor) -> Unit): List<MvNamedElement> {
+    if (referenceName == null) return emptyList()
+    val processor = ResolveVariantsCollector(referenceName)
+    f(processor)
+    return processor.result
+}
+
+private class ResolveVariantsCollector(
+    private val referenceName: String,
+    val result: MutableList<MvNamedElement> = SmartList(),
+): RsResolveProcessorBase<ScopeEntry> {
+    override val names: Set<String> = setOf(referenceName)
+
+    override fun process(entry: ScopeEntry): Boolean {
+        if (entry.name == referenceName) {
+            val element = entry.element
+//            if (element !is RsDocAndAttributeOwner || element.existsAfterExpansionSelf) {
+            result += element
+//            }
+        }
+        return false
+    }
+}
+
+fun <T: ScopeEntry> collectResolveVariantsAsScopeEntries(
+    referenceName: String?,
+    f: (RsResolveProcessorBase<T>) -> Unit
+): List<T> {
+    if (referenceName == null) return emptyList()
+    val processor = ResolveVariantsAsScopeEntriesCollector<T>(referenceName)
+    f(processor)
+    return processor.result
+}
+
+private class ResolveVariantsAsScopeEntriesCollector<T: ScopeEntry>(
+    private val referenceName: String,
+    val result: MutableList<T> = mutableListOf(),
+): RsResolveProcessorBase<T> {
+    override val names: Set<String> = setOf(referenceName)
+
+    override fun process(entry: T): Boolean {
+        if (entry.name == referenceName) {
+//            val element = entry.element
+//            if (element !is RsDocAndAttributeOwner || element.existsAfterExpansionSelf) {
+            result += entry
+//            }
+        }
+        return false
+    }
+}
+
+/// checks for visibility of items
+fun collectMethodOrPathResolveVariants(
+    methodOrPath: MvMethodOrPath,
+    ctx: ResolutionContext,
+    f: (RsResolveProcessor) -> Unit
+): List<RsPathResolveResult<MvElement>> {
+    val referenceName = methodOrPath.referenceName ?: return emptyList()
+    val processor = SinglePathResolveVariantsCollector(ctx, referenceName)
+    f(processor)
+    return processor.result
+}
+
+private class SinglePathResolveVariantsCollector(
+    private val ctx: ResolutionContext,
+    private val referenceName: String,
+    val result: MutableList<RsPathResolveResult<MvElement>> = SmartList(),
+): RsResolveProcessorBase<ScopeEntry> {
+    override val names: Set<String> = setOf(referenceName)
+
+    override fun process(entry: ScopeEntry): Boolean {
+        if (entry.name == referenceName) {
+            collectMethodOrPathScopeEntry(ctx, result, entry)
+        }
+        return false
+    }
+}
+
+private fun collectMethodOrPathScopeEntry(
+    ctx: ResolutionContext,
+    result: MutableList<RsPathResolveResult<MvElement>>,
+    e: ScopeEntry
+) {
+    val element = e.element
+    val visibilityStatus = ctx.methodOrPath?.let { e.getVisibilityStatusFrom(it) } ?: Visible
+    val isVisible = visibilityStatus == Visible
+    result += RsPathResolveResult(element, isVisible)
+}
+
+//fun pickFirstResolveVariant(referenceName: String?, f: (RsResolveProcessor) -> Unit): MvElement? =
+//    pickFirstResolveEntry(referenceName, f)?.element
+
+fun pickFirstResolveEntry(referenceName: String?, f: (RsResolveProcessor) -> Unit): ScopeEntry? {
+    if (referenceName == null) return null
+    val processor = PickFirstScopeEntryCollector(referenceName)
+    f(processor)
+    return processor.result
+}
+
+private class PickFirstScopeEntryCollector(
+    private val referenceName: String,
+    var result: ScopeEntry? = null,
+): RsResolveProcessorBase<ScopeEntry> {
+    override val names: Set<String> = setOf(referenceName)
+
+    override fun process(entry: ScopeEntry): Boolean {
+        if (entry.name == referenceName) {
+//            val element = entry.element
+//            if (element !is RsDocAndAttributeOwner || element.existsAfterExpansionSelf) {
+            result = entry
+            return true
+//            }
+        }
+        return false
+    }
+}
+
+
+fun collectCompletionVariants(
+    result: CompletionResultSet,
+    context: CompletionContext,
+    f: (RsResolveProcessor) -> Unit
+) {
+    val processor = CompletionVariantsCollector(result, context)
+    f(processor)
+}
+
+private class CompletionVariantsCollector(
+    private val result: CompletionResultSet,
+    private val context: CompletionContext,
+): RsResolveProcessorBase<ScopeEntry> {
+    override val names: Set<String>? get() = null
+
+    override fun process(entry: ScopeEntry): Boolean {
+//        addEnumVariantsIfNeeded(entry)
+
+        result.addElement(createLookupElement(
+            scopeEntry = entry,
+            completionContext = context,
+            priority = entry.element.completionPriority
+        ))
+        return false
+    }
+
+//    private fun addEnumVariantsIfNeeded(entry: ScopeEntry) {
+//        val element = entry.element as? RsEnumItem ?: return
+//
+//        val expectedType = (context.expectedTy?.ty?.stripReferences() as? TyAdt)?.item
+//        val actualType = (element.declaredType as? TyAdt)?.item
+//
+//        val parent = context.context
+//        val contextPat = if (parent is RsPath) parent.context else parent
+//        val contextIsPat = contextPat is RsPatBinding || contextPat is RsPatStruct || contextPat is RsPatTupleStruct
+//
+//        if (expectedType == actualType || contextIsPat) {
+//            val variants = collectVariantsForEnumCompletion(element, context, entry.subst)
+//            val filtered = when (contextPat) {
+//                is RsPatStruct -> variants.filter { (it.psiElement as? RsEnumVariant)?.blockFields != null }
+//                is RsPatTupleStruct -> variants.filter { (it.psiElement as? RsEnumVariant)?.tupleFields != null }
+//                else -> variants
+//            }
+//            result.addAllElements(filtered)
+//        }
+//    }
+}
+
+//fun collectNames(f: (RsResolveProcessor) -> Unit): Set<String> {
+//    val processor = NamesCollector()
+//    f(processor)
+//    return processor.result
+//}
+
+//private class NamesCollector(
+//    val result: MutableSet<String> = mutableSetOf(),
+//): RsResolveProcessor {
+//    override val names: Set<String>? get() = null
+//
+//    override fun process(entry: SimpleScopeEntry): Boolean {
+//        if (entry.name != "_") {
+//            result += entry.name
+//        }
+//        return false
+//    }
+//}
+
+data class SimpleScopeEntry(
+    override val name: String,
+    override val element: MvNamedElement,
+    override val namespaces: Set<Namespace>,
+//    override val subst: Substitution = emptySubstitution
+): ScopeEntry {
+    override fun doCopyWithNs(namespaces: Set<Namespace>): ScopeEntry = copy(namespaces = namespaces)
+}
+
+data class ModInfo(
+//    val movePackage: MovePackage?,
+    val module: MvModule?,
+//    val isScript: Boolean,
+) {
+}
+
+fun <T> Map<String, T>.entriesWithNames(names: Set<String>?): Map<String, T> {
+    return if (names.isNullOrEmpty()) {
+        this
+    } else if (names.size == 1) {
+        val single = names.single()
+        val value = this[single] ?: return emptyMap()
+        mapOf(single to value)
+    } else {
+        names.mapNotNull { name -> this[name]?.let { name to it } }.toMap()
+    }
+}
+
+fun interface VisibilityFilter {
+    fun filter(methodOrPath: MvMethodOrPath, ns: Set<Namespace>): VisibilityStatus
+}
+
+//typealias VisibilityFilter = (MvPath, Set<Namespace>) -> VisibilityStatus
+//typealias VisibilityFilter = (MvElement, Lazy<ModInfo?>?) -> VisibilityStatus
+
+fun ScopeEntry.getVisibilityStatusFrom(methodOrPath: MvMethodOrPath): VisibilityStatus =
+    if (this is ScopeEntryWithVisibility) {
+        visibilityFilter.filter(methodOrPath, this.namespaces)
+    } else {
+        Visible
+    }
+
+
+fun ScopeEntry.isVisibleFrom(context: MvPath): Boolean = getVisibilityStatusFrom(context) == Visible
+
+enum class VisibilityStatus {
+    Visible,
+    Invisible,
+}
+
+data class ScopeEntryWithVisibility(
+    override val name: String,
+    override val element: MvNamedElement,
+    override val namespaces: Set<Namespace>,
+    /** Given a [MvElement] (usually [MvPath]) checks if this item is visible in `containingMod` of that element */
+    val visibilityFilter: VisibilityFilter,
+//    override val subst: Substitution = emptySubstitution,
+): ScopeEntry {
+    override fun doCopyWithNs(namespaces: Set<Namespace>): ScopeEntry = copy(namespaces = namespaces)
+}
+
+fun RsResolveProcessor.process(
+    name: String,
+    e: MvNamedElement,
+    namespaces: Set<Namespace>,
+    visibilityFilter: VisibilityFilter
+): Boolean = process(ScopeEntryWithVisibility(name, e, namespaces, visibilityFilter))
+
+fun RsResolveProcessor.processAllItems(
+    namespaces: Set<Namespace>,
+    vararg collections: Iterable<MvItemElement>,
+): Boolean {
+    return sequenceOf(*collections).flatten().any { e ->
+        val name = e.name ?: return false
+        val visibilityFilter = e.visInfo().createFilter()
+        process(ScopeEntryWithVisibility(name, e, namespaces, visibilityFilter))
+    }
+}
+
+fun RsResolveProcessor.process(
+    name: String,
+//    namespaces: Set<Namespace>,
+    e: MvNamedElement
+): Boolean =
+    process(SimpleScopeEntry(name, e, Namespace.none()))
+//    process(ScopeEntry(name, e, namespaces))
+
+inline fun RsResolveProcessor.lazy(
+    name: String,
+//    namespaces: Set<Namespace>,
+    e: () -> MvNamedElement?
+): Boolean {
+    if (!acceptsName(name)) return false
+    val element = e() ?: return false
+    return process(name, element)
+}
+
+fun RsResolveProcessor.process(
+    e: MvNamedElement,
+//    namespaces: Set<Namespace>
+): Boolean {
+    val name = e.name ?: return false
+    return process(name, e)
+}
+
+fun RsResolveProcessor.processAll(
+    elements: List<MvNamedElement>,
+//    namespaces: Set<Namespace>
+): Boolean {
+    return elements.any { process(it) }
+}
+
+fun RsResolveProcessor.processAll(
+    vararg collections: Iterable<MvNamedElement>,
+//    namespaces: Set<Namespace>
+): Boolean {
+    return sequenceOf(*collections).flatten().any { process(it) }
+}
+
+fun processAllScopeEntries(elements: List<SimpleScopeEntry>, processor: RsResolveProcessor): Boolean {
+    return elements.any { processor.process(it) }
+}
+
+
+
+
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveFQModuleReferenceImpl.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveFQModuleReferenceImpl.kt
deleted file mode 100644
index d77894cd5..000000000
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveFQModuleReferenceImpl.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.move.lang.core.resolve.ref
-
-import org.move.lang.core.psi.MvFQModuleRef
-import org.move.lang.core.psi.MvModule
-import org.move.lang.core.psi.MvNamedElement
-import org.move.lang.core.resolve.processFQModuleRef
-import org.move.stdext.wrapWithList
-
-interface MvFQModuleReference : MvPolyVariantReference
-
-class MvFQModuleReferenceImpl(
-    element: MvFQModuleRef,
-) : MvPolyVariantReferenceCached<MvFQModuleRef>(element), MvFQModuleReference {
-
-    override val cacheDependency: ResolveCacheDependency get() = ResolveCacheDependency.LOCAL_AND_RUST_STRUCTURE
-
-    override fun multiResolveInner(): List<MvNamedElement> {
-        val referenceName = element.referenceName ?: return emptyList()
-        var resolved: MvModule? = null
-        processFQModuleRef(element, referenceName) {
-            if (it.name == referenceName) {
-                resolved = it.element
-                true
-            } else {
-                false
-            }
-        }
-        return resolved.wrapWithList()
-    }
-}
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveModuleReferenceImpl.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveModuleReferenceImpl.kt
deleted file mode 100644
index 81eacd948..000000000
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveModuleReferenceImpl.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.move.lang.core.resolve.ref
-
-import org.move.lang.core.psi.*
-import org.move.lang.core.psi.ext.isSelfModuleRef
-import org.move.lang.core.psi.ext.itemUseSpeck
-import org.move.lang.core.resolve.resolveLocalItem
-import org.move.stdext.wrapWithList
-
-class MvModuleReferenceImpl(
-    element: MvModuleRef,
-): MvPolyVariantReferenceCached<MvModuleRef>(element) {
-
-    override fun multiResolveInner(): List<MvNamedElement> {
-        if (element.isSelfModuleRef) return element.containingModule.wrapWithList()
-
-        check(element !is MvFQModuleRef) {
-            "That element has different reference item"
-        }
-
-        val resolved = resolveLocalItem(element, setOf(Namespace.MODULE)).firstOrNull()
-        if (resolved is MvUseAlias) {
-            return resolved.wrapWithList()
-        }
-        val moduleRef = when {
-            resolved is MvUseItem && resolved.text == "Self" -> resolved.itemUseSpeck.fqModuleRef
-            resolved is MvModuleUseSpeck -> resolved.fqModuleRef
-            else -> return emptyList()
-        }
-        return moduleRef?.reference?.resolve().wrapWithList()
-    }
-}
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/MovePathReferenceImpl.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/MovePathReferenceImpl.kt
deleted file mode 100644
index 367110ef7..000000000
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/MovePathReferenceImpl.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.move.lang.core.resolve.ref
-
-import org.move.lang.core.psi.*
-import org.move.lang.core.psi.ext.isSelfModuleRef
-import org.move.lang.core.psi.ext.isUpdateFieldArg2
-import org.move.lang.core.psi.ext.itemUseSpeck
-import org.move.lang.core.psi.ext.namespaces
-import org.move.lang.core.resolve.*
-
-class MvPathReferenceImpl(
-    element: MvPath,
-): MvPolyVariantReferenceCached<MvPath>(element), MvPathReference {
-
-    override val cacheDependency: ResolveCacheDependency get() = ResolveCacheDependency.LOCAL_AND_RUST_STRUCTURE
-
-    override fun multiResolveInner(): List<MvNamedElement> {
-        val pathNamespaces = element.namespaces()
-        val vs = Visibility.visibilityScopesForElement(element)
-        val contextScopeInfo =
-            ContextScopeInfo(
-                refItemScopes = element.refItemScopes,
-                letStmtScope = element.letStmtScope,
-            )
-
-        val refName = element.referenceName ?: return emptyList()
-        val moduleRef = element.moduleRef
-        // first, see whether it's a fully qualified path (ADDRESS::MODULE::NAME) and try to resolve those
-        if (moduleRef is MvFQModuleRef) {
-            // TODO: can be replaced with index call
-            val module = moduleRef.reference?.resolve() as? MvModule ?: return emptyList()
-            return resolveModuleItem(module, refName, pathNamespaces, vs, contextScopeInfo)
-        }
-        // second,
-        // if it's MODULE::NAME -> resolve MODULE into corresponding FQModuleRef using imports
-        if (moduleRef != null) {
-            if (moduleRef.isSelfModuleRef) {
-                val containingModule = moduleRef.containingModule ?: return emptyList()
-                return resolveModuleItem(
-                    containingModule,
-                    refName,
-                    pathNamespaces,
-                    setOf(Visibility.Internal),
-                    contextScopeInfo
-                )
-            }
-            val useSpeckFQModuleRef = resolveIntoFQModuleRefInUseSpeck(moduleRef) ?: return emptyList()
-            val useSpeckModule =
-                useSpeckFQModuleRef.reference?.resolve() as? MvModule ?: return emptyList()
-            return resolveModuleItem(useSpeckModule, refName, pathNamespaces, vs, contextScopeInfo)
-        } else {
-            // if it's NAME
-            // special case second argument of update_field function in specs
-            if (element.isUpdateFieldArg2) return emptyList()
-
-            // try local names
-            val item = resolveLocalItem(element, pathNamespaces).firstOrNull() ?: return emptyList()
-            // local name -> return
-            return when (item) {
-                // item import
-                is MvUseItem -> {
-                    // find corresponding FQModuleRef from imports and resolve
-//                    // TODO: index call
-                    val useSpeckModule =
-                        item.itemUseSpeck.fqModuleRef.reference?.resolve() as? MvModule
-                            ?: return emptyList()
-                    return resolveModuleItem(useSpeckModule, refName, pathNamespaces, vs, contextScopeInfo)
-                }
-                // module import
-                is MvModuleUseSpeck -> {
-                    val module = item.fqModuleRef?.reference?.resolve() as? MvModule
-                    return listOfNotNull(module)
-                }
-                // local item
-                else -> listOf(item)
-            }
-        }
-    }
-}
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReference.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReference.kt
index dfa94ef3d..75bda53ff 100644
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReference.kt
+++ b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReference.kt
@@ -4,8 +4,7 @@ import com.intellij.psi.PsiPolyVariantReference
 import org.move.lang.core.psi.MvElement
 import org.move.lang.core.psi.MvNamedElement
 import org.move.lang.core.psi.MvUseAlias
-import org.move.lang.core.psi.ext.moduleUseSpeck
-import org.move.lang.core.psi.ext.useItem
+import org.move.lang.core.psi.ext.parentUseSpeck
 
 interface MvPolyVariantReference : PsiPolyVariantReference {
 
@@ -13,14 +12,11 @@ interface MvPolyVariantReference : PsiPolyVariantReference {
 
     override fun resolve(): MvNamedElement?
 
-    fun resolveWithAliases(): MvNamedElement? {
+    fun resolveFollowingAliases(): MvNamedElement? {
         val resolved = this.resolve()
         if (resolved is MvUseAlias) {
-            val useItem = resolved.useItem
-            if (useItem != null) {
-                return useItem.reference.resolve()
-            }
-            return resolved.moduleUseSpeck?.fqModuleRef?.reference?.resolve()
+            val aliasedPath = resolved.parentUseSpeck.path
+            return aliasedPath.reference?.resolve()
         }
         return resolved
     }
@@ -29,6 +25,17 @@ interface MvPolyVariantReference : PsiPolyVariantReference {
 }
 
 interface MvPathReference : MvPolyVariantReference {
-//    fun advancedResolve(): BoundElement<MvElement>? =
-//        resolveWithAliases()?.let { BoundElement(it) }
+
+//    fun multiResolveIfVisible(): List<MvElement> = multiResolve()
+//
+//    fun rawMultiResolve(): List<RsPathResolveResult<MvElement>> =
+//        multiResolve().map { RsPathResolveResult(it, isVisible = true) }
+}
+
+interface MvPath2Reference: MvPolyVariantReference {
+//    fun multiResolveIfVisible(): List<MvElement> = multiResolve()
+
+//    fun rawMultiResolve(): List<RsPathResolveResult<MvElement>>
+//        multiResolve().map { RsPathResolveResult(it, isVisible = true) }
+    
 }
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceBase.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceBase.kt
index 1500fc1f8..6e9b46c1c 100644
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceBase.kt
+++ b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceBase.kt
@@ -39,7 +39,7 @@ abstract class MvPolyVariantReferenceBase<T: MvReferenceElement>(element: T):
         return element
     }
 
-    final override fun resolve(): MvNamedElement? = super.resolve() as? MvNamedElement
+    override fun resolve(): MvNamedElement? = super.resolve() as? MvNamedElement
 
     override fun multiResolve(incompleteCode: Boolean): Array<out ResolveResult> =
         multiResolve().map { PsiElementResolveResult(it) }.toTypedArray()
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceElement.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceElement.kt
index d23a1b321..4e2d0f9d9 100644
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceElement.kt
+++ b/src/main/kotlin/org/move/lang/core/resolve/ref/MoveReferenceElement.kt
@@ -57,10 +57,14 @@ interface MvPathReferenceElement : MvReferenceElement {
     override fun getReference(): MvPathReference?
 }
 
-interface MvFQModuleReferenceElement : MvReferenceElement {
-    override fun getReference(): MvFQModuleReference?
+interface MvNameAccessChainReferenceElement : MvReferenceElement {
+    override fun getReference(): MvPath2Reference?
 }
 
+//interface MvFQModuleReferenceElement : MvReferenceElement {
+//    override fun getReference(): MvFQModuleReference?
+//}
+
 interface MvStructPatFieldReferenceElement : MvMandatoryReferenceElement
 
 interface MvStructFieldLitReferenceElement : MvMandatoryReferenceElement
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/Namespace.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/Namespace.kt
index d6de0eb66..a92502c39 100644
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/Namespace.kt
+++ b/src/main/kotlin/org/move/lang/core/resolve/ref/Namespace.kt
@@ -1,46 +1,18 @@
 package org.move.lang.core.resolve.ref
 
-import com.intellij.psi.SmartPsiElementPointer
 import org.move.cli.MovePackage
-import org.move.cli.containingMovePackage
-import org.move.lang.core.psi.MvElement
 import org.move.lang.core.psi.MvModule
-import org.move.lang.core.psi.containingFunction
-import org.move.lang.core.psi.containingModule
-import org.move.lang.core.psi.ext.FunctionVisibility
-import org.move.lang.core.psi.ext.asSmartPointer
-import org.move.lang.core.psi.ext.visibility
+import java.util.*
 
-sealed class Visibility {
-    object Public : Visibility()
-    object PublicScript : Visibility()
-    class PublicFriend(val currentModule: SmartPsiElementPointer<MvModule>) : Visibility()
-    data class PublicPackage(val originPackage: MovePackage) : Visibility()
-    object Internal : Visibility()
-
-    companion object {
-        fun local(): Set<Visibility> = setOf(Public, Internal)
-        fun none(): Set<Visibility> = setOf()
-
-        fun visibilityScopesForElement(element: MvElement): Set<Visibility> {
-            val vs = mutableSetOf<Visibility>(Public)
-            val containingModule = element.containingModule
-            if (containingModule != null) {
-                vs.add(PublicFriend(containingModule.asSmartPointer()))
-            }
-            val containingFun = element.containingFunction
-            if (containingModule == null
-                || (containingFun?.visibility == FunctionVisibility.PUBLIC_SCRIPT)
-            ) {
-                vs.add(PublicScript)
-            }
-            val containingMovePackage = element.containingMovePackage
-            if (containingMovePackage != null) {
-                vs.add(PublicPackage(containingMovePackage))
-            }
-            return vs
-        }
+sealed class Visibility2 {
+    data object Public: Visibility2()
+    data object Private: Visibility2()
+    sealed class Restricted: Visibility2() {
+        class Friend(val friendModules: Lazy<Set<MvModule>>): Restricted()
+        class Package(val originPackage: MovePackage): Restricted()
+        data object Script: Restricted()
     }
+
 }
 
 enum class Namespace {
@@ -53,9 +25,11 @@ enum class Namespace {
 
     companion object {
         fun all(): Set<Namespace> {
-            return setOf(NAME, FUNCTION, TYPE, SCHEMA, MODULE, CONST)
+            return EnumSet.of(NAME, FUNCTION, TYPE, SCHEMA, MODULE, CONST)
         }
 
+        fun items(): Set<Namespace> = EnumSet.of(NAME, FUNCTION, TYPE, SCHEMA, CONST)
+
         fun none(): Set<Namespace> = setOf()
     }
 }
diff --git a/src/main/kotlin/org/move/lang/core/resolve/ref/field_ref.kt b/src/main/kotlin/org/move/lang/core/resolve/ref/field_ref.kt
deleted file mode 100644
index 22f17531a..000000000
--- a/src/main/kotlin/org/move/lang/core/resolve/ref/field_ref.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.move.lang.core.resolve.ref
-
-import org.move.lang.core.psi.MvNamedElement
-import org.move.lang.core.psi.MvStruct
-import org.move.lang.core.psi.MvStructLitField
-import org.move.lang.core.psi.MvStructPatField
-import org.move.lang.core.psi.ext.*
-import org.move.lang.core.resolve.resolveLocalItem
-
-interface MvStructRefField: MvReferenceElement
-
-class MvStructRefFieldReferenceImpl(
-    element: MvStructRefField
-) : MvPolyVariantReferenceCached<MvStructRefField>(element) {
-
-    override fun multiResolveInner() = resolveIntoStructField(element)
-}
-
-class MvStructLitShorthandFieldReferenceImpl(
-    element: MvStructLitField,
-) : MvPolyVariantReferenceCached<MvStructLitField>(element) {
-
-    override fun multiResolveInner(): List<MvNamedElement> {
-        return listOf(
-            resolveIntoStructField(element),
-            resolveLocalItem(element, setOf(Namespace.NAME))
-        ).flatten()
-    }
-}
-
-class MvStructPatShorthandFieldReferenceImpl(
-    element: MvStructPatField
-) : MvPolyVariantReferenceCached<MvStructPatField>(element) {
-
-    override fun multiResolveInner(): List<MvNamedElement> = resolveIntoStructField(element)
-}
-
-private val MvStructRefField.maybeStruct: MvStruct? get() {
-    return when (this) {
-        is MvStructPatField -> this.structPat.structItem
-        is MvStructLitField -> this.structLitExpr.path.maybeStruct
-        else -> null
-    }
-}
-
-private fun resolveIntoStructField(element: MvStructRefField): List<MvNamedElement> {
-    val structItem = element.maybeStruct ?: return emptyList()
-    val referenceName = element.referenceName
-    return structItem.fields
-        .filter { it.name == referenceName }
-}
diff --git a/src/main/kotlin/org/move/lang/core/resolve2/ItemResolution.kt b/src/main/kotlin/org/move/lang/core/resolve2/ItemResolution.kt
new file mode 100644
index 000000000..5a6c1e804
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve2/ItemResolution.kt
@@ -0,0 +1,106 @@
+package org.move.lang.core.resolve2
+
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.ext.*
+import org.move.lang.core.resolve.*
+import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.types.infer.foldTyTypeParameterWith
+import org.move.lang.core.types.ty.Ty
+import org.move.lang.core.types.ty.TyInfer
+import org.move.lang.core.types.ty.TyReference
+import org.move.lang.moveProject
+import java.util.*
+
+val MvNamedElement.namespaces: Set<Namespace>
+    get() = when (this) {
+        is MvFunction -> EnumSet.of(Namespace.FUNCTION)
+        is MvStruct -> EnumSet.of(Namespace.TYPE)
+        is MvConst -> EnumSet.of(Namespace.NAME)
+//        is MvConst -> EnumSet.of(Namespace.CONST)
+        is MvSchema -> EnumSet.of(Namespace.SCHEMA)
+        is MvModule -> EnumSet.of(Namespace.MODULE)
+        else -> EnumSet.of(Namespace.NAME)
+    }
+
+val MvNamedElement.namespace
+    get() = when (this) {
+        is MvFunctionLike -> Namespace.FUNCTION
+        is MvStruct -> Namespace.TYPE
+        is MvConst -> Namespace.NAME
+        is MvSchema -> Namespace.SCHEMA
+        is MvModule -> Namespace.MODULE
+        is MvGlobalVariableStmt -> Namespace.NAME
+        else -> error("when should be exhaustive, $this is not covered")
+    }
+
+fun processMethodResolveVariants(
+    methodOrField: MvMethodOrField,
+    receiverTy: Ty,
+    msl: Boolean,
+    processor: RsResolveProcessor
+): Boolean {
+    val moveProject = methodOrField.moveProject ?: return false
+    val itemModule = receiverTy.itemModule(moveProject) ?: return false
+    return processor
+        .wrapWithFilter { e ->
+            val function = e.element as? MvFunction ?: return@wrapWithFilter false
+            val selfTy = function.selfParamTy(msl) ?: return@wrapWithFilter false
+            // need to use TyVar here, loweredType() erases them
+            val selfTyWithTyVars =
+                selfTy.foldTyTypeParameterWith { tp -> TyInfer.TyVar(tp) }
+            TyReference.isCompatibleWithAutoborrow(receiverTy, selfTyWithTyVars, msl)
+        }
+        .processAllItems(setOf(Namespace.FUNCTION), itemModule.allNonTestFunctions())
+}
+
+fun processItemDeclarations(
+    itemsOwner: MvItemsOwner,
+    ns: Set<Namespace>,
+    processor: RsResolveProcessor
+): Boolean {
+
+    // 1. loop over all items in module (item is anything accessible with MODULE:: )
+    // 2. for every item, use it's .visibility to create VisibilityFilter, even it's just a { false }
+    val items = itemsOwner.itemElements +
+            (itemsOwner as? MvModuleBlock)?.module?.innerSpecItems.orEmpty() +
+            (itemsOwner as? MvModuleBlock)?.module?.let { getItemsFromModuleSpecs(it, ns) }.orEmpty()
+    for (item in items) {
+        val name = item.name ?: continue
+
+        val namespace = item.namespace
+        if (namespace !in ns) continue
+
+        val visibilityFilter = item.visInfo().createFilter()
+        if (processor.process(name, item, EnumSet.of(namespace), visibilityFilter)) return true
+    }
+
+    return false
+}
+
+fun getItemsFromModuleSpecs(module: MvModule, ns: Set<Namespace>): List<MvItemElement> {
+    val c = mutableListOf<MvItemElement>()
+    processItemsFromModuleSpecs(module, ns, createProcessor { c.add(it.element as MvItemElement) })
+    return c
+}
+
+fun processItemsFromModuleSpecs(
+    module: MvModule,
+    namespaces: Set<Namespace>,
+    processor: RsResolveProcessor,
+): Boolean {
+    for (namespace in namespaces) {
+        for (moduleSpec in module.allModuleSpecs()) {
+            val matched = when (namespace) {
+                Namespace.FUNCTION ->
+                    processor.processAll(
+                        moduleSpec.specFunctions(),
+                        moduleSpec.specInlineFunctions(),
+                    )
+                Namespace.SCHEMA -> processor.processAll(moduleSpec.schemas())
+                else -> false
+            }
+            if (matched) return true
+        }
+    }
+    return false
+}
diff --git a/src/main/kotlin/org/move/lang/core/resolve/LexicalDeclarations.kt b/src/main/kotlin/org/move/lang/core/resolve2/LexicalDeclarations2.kt
similarity index 52%
rename from src/main/kotlin/org/move/lang/core/resolve/LexicalDeclarations.kt
rename to src/main/kotlin/org/move/lang/core/resolve2/LexicalDeclarations2.kt
index d1be1e506..716a5fa03 100644
--- a/src/main/kotlin/org/move/lang/core/resolve/LexicalDeclarations.kt
+++ b/src/main/kotlin/org/move/lang/core/resolve2/LexicalDeclarations2.kt
@@ -1,57 +1,42 @@
-package org.move.lang.core.resolve
+package org.move.lang.core.resolve2
 
 import com.intellij.psi.util.PsiTreeUtil
+import org.move.ide.inspections.imports.usageScope
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
+import org.move.lang.core.resolve.*
+import org.move.lang.core.resolve.LetStmtScope.*
 import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.resolve2.ref.ResolutionContext
+import org.move.lang.core.resolve2.util.forEachLeafSpeck
 
 fun processItemsInScope(
     scope: MvElement,
     cameFrom: MvElement,
-    namespaces: Set<Namespace>,
-    contextScopeInfo: ContextScopeInfo,
-    processor: MatchingProcessor<MvNamedElement>,
+    ns: Set<Namespace>,
+    ctx: ResolutionContext,
+    processor: RsResolveProcessor,
 ): Boolean {
-    for (namespace in namespaces) {
+    for (namespace in ns) {
         val stop = when (namespace) {
-
-            Namespace.CONST -> {
-                val found = when (scope) {
-                    is MvModuleBlock -> {
-                        val module = scope.parent as MvModule
-                        processor.matchAll(
-                            contextScopeInfo,
-                            module.consts(),
-                        )
-                    }
-                    else -> false
-                }
-                if (!found) {
-                    if (scope is MvImportsOwner) {
-                        if (processor.matchAll(contextScopeInfo, scope.allUseItems())) return true
-                    }
-                }
-                found
-            }
-
             Namespace.NAME -> {
                 val found = when (scope) {
                     is MvModuleBlock -> {
                         val module = scope.parent as MvModule
-                        processor.matchAll(
-                            contextScopeInfo,
+                        processor.processAllItems(
+                            ns,
                             module.structs(),
                             module.consts(),
                         )
                     }
-                    is MvModuleSpecBlock -> processor.matchAll(contextScopeInfo, scope.schemaList)
-                    is MvScript -> processor.matchAll(contextScopeInfo, scope.consts())
-                    is MvFunctionLike -> processor.matchAll(contextScopeInfo, scope.allParamsAsBindings)
-                    is MvLambdaExpr -> processor.matchAll(contextScopeInfo, scope.bindingPatList)
+                    is MvModuleSpecBlock -> processor.processAllItems(ns, scope.schemaList)
+                    is MvScript -> processor.processAllItems(ns, scope.consts())
+                    is MvFunctionLike -> processor.processAll(scope.allParamsAsBindings)
+                    is MvLambdaExpr -> processor.processAll(scope.bindingPatList)
                     is MvForExpr -> {
                         val iterConditionBindingPat = scope.forIterCondition?.bindingPat
                         if (iterConditionBindingPat != null) {
-                            processor.match(iterConditionBindingPat)
+                            processor.process(iterConditionBindingPat)
                         } else {
                             false
                         }
@@ -60,18 +45,18 @@ fun processItemsInScope(
                         val item = scope.item
                         when (item) {
                             is MvFunction -> {
-                                processor.matchAll(
-                                    contextScopeInfo,
+                                processor.processAll(
+//                                    contextScopeInfo,
                                     item.valueParamsAsBindings,
                                     item.specResultParameters.map { it.bindingPat },
                                 )
                             }
-                            is MvStruct -> processor.matchAll(contextScopeInfo, item.fields)
+                            is MvStruct -> processor.processAll(item.fields)
                             else -> false
                         }
                     }
-                    is MvSchema -> processor.matchAll(contextScopeInfo, scope.fieldBindings)
-                    is MvQuantBindingsOwner -> processor.matchAll(contextScopeInfo, scope.bindings)
+                    is MvSchema -> processor.processAll(scope.fieldBindings)
+                    is MvQuantBindingsOwner -> processor.processAll(scope.bindings)
                     is MvCodeBlock,
                     is MvSpecCodeBlock -> {
                         val visibleLetStmts = when (scope) {
@@ -86,14 +71,16 @@ fun processItemsInScope(
                                     }
                             }
                             is MvSpecCodeBlock -> {
-                                when (contextScopeInfo.letStmtScope) {
-                                    LetStmtScope.EXPR_STMT -> scope.allLetStmts
-                                    LetStmtScope.LET_STMT, LetStmtScope.LET_POST_STMT -> {
-                                        val letDecls = if (contextScopeInfo.letStmtScope == LetStmtScope.LET_POST_STMT) {
-                                            scope.allLetStmts
-                                        } else {
-                                            scope.letStmts(false)
-                                        }
+                                val letStmtScope = ctx.element.letStmtScope
+                                when (letStmtScope) {
+                                    EXPR_STMT -> scope.allLetStmts
+                                    LET_STMT, LET_POST_STMT -> {
+                                        val letDecls =
+                                            if (letStmtScope == LET_POST_STMT) {
+                                                scope.allLetStmts
+                                            } else {
+                                                scope.letStmts(false)
+                                            }
                                         letDecls
                                             // drops all let-statements after the current position
                                             .filter { it.cameBefore(cameFrom) }
@@ -103,7 +90,7 @@ fun processItemsInScope(
                                                         && !PsiTreeUtil.isAncestor(cameFrom, it, true)
                                             }
                                     }
-                                    LetStmtScope.NONE -> emptyList()
+                                    NONE -> emptyList()
                                 }
                             }
                             else -> error("unreachable")
@@ -115,15 +102,18 @@ fun processItemsInScope(
 
                         // skip shadowed (already visited) elements
                         val visited = mutableSetOf<String>()
-                        val processorWithShadowing = MatchingProcessor { entry ->
-                            ((entry.name !in visited)
-                                    && processor.match(entry).also { visited += entry.name })
+                        val shadowingProcessor = processor.wrapWithFilter {
+                            val isVisited = it.name in visited
+                            if (!isVisited) {
+                                visited += it.name
+                            }
+                            !isVisited
                         }
-                        var found = processorWithShadowing.matchAll(contextScopeInfo, namedElements)
+                        var found = shadowingProcessor.processAll(namedElements)
                         if (!found && scope is MvSpecCodeBlock) {
-                            // if inside SpecCodeBlock, match also with builtin spec consts and global variables
-                            found = processorWithShadowing.matchAll(
-                                contextScopeInfo,
+                            // if inside SpecCodeBlock, process also with builtin spec consts and global variables
+                            found = shadowingProcessor.processAllItems(
+                                ns,
                                 scope.builtinSpecConsts(),
                                 scope.globalVariables()
                             )
@@ -132,31 +122,19 @@ fun processItemsInScope(
                     }
                     else -> false
                 }
-                if (!found) {
-                    if (scope is MvImportsOwner) {
-                        if (processor.matchAll(contextScopeInfo, scope.allUseItems())) return true
-                    }
-                }
                 found
             }
             Namespace.FUNCTION -> {
                 val found = when (scope) {
                     is MvModuleBlock -> {
                         val module = scope.parent as MvModule
-                        val specFunctions = if (contextScopeInfo.isMslScope) {
+                        val specFunctions =
                             listOf(module.specFunctions(), module.builtinSpecFunctions()).flatten()
-                        } else {
-                            emptyList()
-                        }
-                        val specInlineFunctions = if (contextScopeInfo.isMslScope) {
-                            module.moduleItemSpecs().flatMap { it.specInlineFunctions() }
-                        } else {
-                            emptyList()
-                        }
-                        processor.matchAll(
-                            contextScopeInfo,
-                            module.allNonTestFunctions(),
+                        val specInlineFunctions = module.moduleItemSpecs().flatMap { it.specInlineFunctions() }
+                        processor.processAllItems(
+                            ns,
                             module.builtinFunctions(),
+                            module.allNonTestFunctions(),
                             specFunctions,
                             specInlineFunctions
                         )
@@ -164,95 +142,113 @@ fun processItemsInScope(
                     is MvModuleSpecBlock -> {
                         val specFunctions = scope.specFunctionList
                         val specInlineFunctions = scope.moduleItemSpecList.flatMap { it.specInlineFunctions() }
-                        processor.matchAll(
-                            contextScopeInfo,
+                        processor.processAllItems(
+                            ns,
                             specFunctions,
                             specInlineFunctions
                         )
                     }
-                    is MvFunctionLike -> processor.matchAll(contextScopeInfo, scope.lambdaParamsAsBindings)
-                    is MvLambdaExpr -> processor.matchAll(contextScopeInfo, scope.bindingPatList)
+                    is MvFunctionLike -> processor.processAll(scope.lambdaParamsAsBindings)
+                    is MvLambdaExpr -> processor.processAll(scope.bindingPatList)
                     is MvItemSpec -> {
                         val item = scope.item
                         when (item) {
-                            is MvFunction -> processor.matchAll(contextScopeInfo, item.lambdaParamsAsBindings)
+                            is MvFunction -> processor.processAll(item.lambdaParamsAsBindings)
                             else -> false
                         }
                     }
                     is MvSpecCodeBlock -> {
                         val inlineFunctions = scope.specInlineFunctions().asReversed()
-                        return processor.matchAll(contextScopeInfo, inlineFunctions)
+                        processor.processAllItems(ns, inlineFunctions)
                     }
                     else -> false
                 }
-                if (!found) {
-                    if (scope is MvImportsOwner) {
-                        if (processor.matchAll(contextScopeInfo, scope.allUseItems())) return true
-                    }
-                }
                 found
             }
 
             Namespace.TYPE -> {
                 if (scope is MvTypeParametersOwner) {
-                    if (processor.matchAll(contextScopeInfo, scope.typeParameters)) return true
+                    if (processor.processAll(scope.typeParameters)) return true
                 }
                 val found = when (scope) {
                     is MvItemSpec -> {
                         val funcItem = scope.funcItem
                         if (funcItem != null) {
-                            processor.matchAll(contextScopeInfo, funcItem.typeParameters)
+                            processor.processAll(funcItem.typeParameters)
                         } else {
                             false
                         }
                     }
                     is MvModuleBlock -> {
                         val module = scope.parent as MvModule
-                        processor.matchAll(
-                            contextScopeInfo,
-                            scope.allUseItems(),
-                            module.structs()
-                        )
+                        processor.processAllItems(ns, module.structs())
                     }
                     is MvApplySchemaStmt -> {
                         val toPatterns = scope.applyTo?.functionPatternList.orEmpty()
                         val patternTypeParams =
                             toPatterns.flatMap { it.typeParameterList?.typeParameterList.orEmpty() }
-                        processor.matchAll(contextScopeInfo, patternTypeParams)
+                        processor.processAll(patternTypeParams)
                     }
 
                     else -> false
                 }
-                if (!found) {
-                    if (scope is MvImportsOwner) {
-                        if (processor.matchAll(contextScopeInfo, scope.allUseItems())) return true
-                    }
-                }
                 found
             }
 
             Namespace.SCHEMA -> when (scope) {
-                is MvModuleBlock -> processor.matchAll(
-                    contextScopeInfo,
-                    scope.allUseItems(),
-                    scope.schemaList
-                )
-                is MvModuleSpecBlock -> processor.matchAll(
-                    contextScopeInfo,
-                    scope.allUseItems(),
-                    scope.schemaList,
-                    scope.specFunctionList
-                )
+                is MvModuleBlock -> processor.processAllItems(ns, scope.schemaList)
+                is MvModuleSpecBlock -> processor.processAllItems(ns, scope.schemaList, scope.specFunctionList)
                 else -> false
             }
+            else -> false
+        }
+        if (stop) return true
+    }
 
-            Namespace.MODULE -> when (scope) {
-                is MvImportsOwner ->
-                    processor.matchAll(contextScopeInfo, scope.moduleUseItems())
-                else -> false
+    if (scope is MvItemsOwner) {
+        if (scope.processUseSpeckElements(ns, processor)) return true
+    }
+
+    return false
+}
+
+private fun MvItemsOwner.processUseSpeckElements(ns: Set<Namespace>, processor: RsResolveProcessor): Boolean {
+    var stop = false
+    for (useStmt in this.useStmtList) {
+        useStmt.forEachLeafSpeck { path, alias ->
+            val name = if (alias != null) {
+                alias.name ?: return@forEachLeafSpeck false
+            } else {
+                var n = path.referenceName ?: return@forEachLeafSpeck false
+                // 0x1::m::Self -> 0x1::m
+                if (n == "Self") {
+                    n = path.qualifier?.referenceName ?: return@forEachLeafSpeck false
+                }
+                n
             }
+            val namedElement = path.reference?.resolve()
+            if (namedElement == null) {
+                if (alias != null) {
+                    // aliased element cannot be resolved, but alias itself is valid, resolve to it
+                    if (processor.process(name, alias)) return@forEachLeafSpeck true
+                }
+                // todo: should it be resolved to import anyway?
+                return@forEachLeafSpeck false
+            }
+
+            val element = alias ?: namedElement
+            val namespace = namedElement.namespace
+            val useSpeckUsageScope = path.usageScope
+            val visibilityFilter =
+                namedElement.visInfo(adjustScope = useSpeckUsageScope).createFilter()
+
+            if (namespace in ns && processor.process(name, element, ns, visibilityFilter)) {
+                stop = true
+                return@forEachLeafSpeck true
+            }
+            false
         }
         if (stop) return true
     }
-    return false
+    return stop
 }
diff --git a/src/main/kotlin/org/move/lang/core/resolve2/NameResolution2.kt b/src/main/kotlin/org/move/lang/core/resolve2/NameResolution2.kt
new file mode 100644
index 000000000..1e71eaf9e
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve2/NameResolution2.kt
@@ -0,0 +1,183 @@
+package org.move.lang.core.resolve2
+
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.ext.*
+import org.move.lang.core.resolve.*
+import org.move.lang.core.resolve.ref.MvMandatoryReferenceElement
+import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.resolve.ref.Namespace.MODULE
+import org.move.lang.core.resolve2.ref.ResolutionContext
+import org.move.lang.core.types.Address
+import org.move.lang.core.types.Address.Named
+import org.move.lang.core.types.address
+import org.move.lang.index.MvModuleIndex
+
+fun resolveBindingForFieldShorthand(
+    element: MvMandatoryReferenceElement,
+): List<MvNamedElement> {
+    return collectResolveVariants(element.referenceName) {
+        processNestedScopesUpwards(
+            element,
+            setOf(Namespace.NAME),
+            ResolutionContext(element, isCompletion = false),
+            it
+        )
+    }
+}
+
+fun processNestedScopesUpwards(
+    scopeStart: MvElement,
+    ns: Set<Namespace>,
+    ctx: ResolutionContext,
+    processor: RsResolveProcessor
+): Boolean {
+    val prevScope = hashMapOf<String, Set<Namespace>>()
+    return walkUpThroughScopes(
+        scopeStart,
+        stopAfter = { it is MvModule }
+    ) { cameFrom, scope ->
+        processWithShadowingAndUpdateScope(prevScope, ns, processor) { shadowingProcessor ->
+            processItemsInScope(
+                scope, cameFrom, ns, ctx, shadowingProcessor
+            )
+        }
+    }
+}
+
+fun processModulePathResolveVariants(
+    ctx: ResolutionContext,
+    address: Address,
+    processor: RsResolveProcessor,
+): Boolean {
+    // if no project, cannot use the index
+    val moveProject = ctx.moveProject
+    if (moveProject == null) return false
+
+    val project = ctx.element.project
+    val searchScope = moveProject.searchScope()
+
+    val addrProcessor = processor.wrapWithFilter { e ->
+        val candidate = e.element as? MvModule ?: return@wrapWithFilter false
+        val candidateAddress = candidate.address(moveProject)
+        val sameValues = Address.equals(address, candidateAddress)
+
+        if (ctx.isCompletion && sameValues) {
+            // compare named addresses by name in case of the same values for the completion
+            if (address is Named && candidateAddress is Named && address.name != candidateAddress.name)
+                return@wrapWithFilter false
+        }
+
+        sameValues
+    }
+
+    val targetNames = addrProcessor.names
+    if (targetNames == null) {
+        // completion
+        val moduleNames = MvModuleIndex.getAllModuleNames(project)
+        moduleNames.forEach { moduleName ->
+            val modules = MvModuleIndex.getModulesByName(project, moduleName, searchScope)
+            for (module in modules) {
+                if (addrProcessor.process(moduleName, module)) return true
+            }
+        }
+        return false
+    }
+
+    var stop = false
+    for (targetModuleName in targetNames) {
+        MvModuleIndex
+            .processModulesByName(project, targetModuleName, searchScope) {
+                val module = it
+                val visFilter = module.visInfo().createFilter()
+                stop = addrProcessor.process(targetModuleName, module, setOf(MODULE), visFilter)
+                // true to continue processing, if .process does not find anything, it returns false
+                !stop
+            }
+        if (stop) return true
+    }
+
+    return false
+}
+
+inline fun processWithShadowingAndUpdateScope(
+    prevScope: MutableMap<String, Set<Namespace>>,
+    ns: Set<Namespace>,
+    processor: RsResolveProcessor,
+    f: (RsResolveProcessor) -> Boolean
+): Boolean {
+    val currScope = mutableMapOf<String, Set<Namespace>>()
+    val shadowingProcessor = processor.wrapWithShadowingProcessorAndUpdateScope(prevScope, currScope, ns)
+    return try {
+        f(shadowingProcessor)
+    } finally {
+        prevScope.putAll(currScope)
+    }
+}
+
+inline fun processWithShadowing(
+    prevScope: Map<String, Set<Namespace>>,
+    ns: Set<Namespace>,
+    processor: RsResolveProcessor,
+    f: (RsResolveProcessor) -> Boolean
+): Boolean {
+    val shadowingProcessor = processor.wrapWithShadowingProcessor(prevScope, ns)
+    return f(shadowingProcessor)
+}
+
+
+fun walkUpThroughScopes(
+    start: MvElement,
+    stopAfter: (MvElement) -> Boolean,
+    handleScope: (cameFrom: MvElement, scope: MvElement) -> Boolean,
+): Boolean {
+    var cameFrom = start
+    var scope = start.context as MvElement?
+    while (scope != null) {
+        if (handleScope(cameFrom, scope)) return true
+
+        // walk all items in original module block
+        if (scope is MvModuleBlock) {
+            // handle spec module {}
+            if (handleModuleItemSpecsInBlock(cameFrom, scope, handleScope)) return true
+            // walk over all spec modules
+            for (moduleSpec in scope.module.allModuleSpecs()) {
+                val moduleSpecBlock = moduleSpec.moduleSpecBlock ?: continue
+                if (handleScope(cameFrom, moduleSpecBlock)) return true
+                if (handleModuleItemSpecsInBlock(cameFrom, moduleSpecBlock, handleScope)) return true
+            }
+        }
+
+        if (scope is MvModuleSpecBlock) {
+            val moduleBlock = scope.moduleSpec.moduleItem?.moduleBlock
+            if (moduleBlock != null) {
+                cameFrom = scope
+                scope = moduleBlock
+                continue
+            }
+        }
+
+        if (stopAfter(scope)) break
+
+        cameFrom = scope
+        scope = scope.context as? MvElement
+    }
+
+    return false
+}
+
+private fun handleModuleItemSpecsInBlock(
+    cameFrom: MvElement,
+    block: MvElement,
+    handleScope: (cameFrom: MvElement, scope: MvElement) -> Boolean
+): Boolean {
+    val moduleItemSpecs = when (block) {
+        is MvModuleBlock -> block.moduleItemSpecList
+        is MvModuleSpecBlock -> block.moduleItemSpecList
+        else -> emptyList()
+    }
+    for (moduleItemSpec in moduleItemSpecs.filter { it != cameFrom }) {
+        val itemSpecBlock = moduleItemSpec.itemSpecBlock ?: continue
+        if (handleScope(cameFrom, itemSpecBlock)) return true
+    }
+    return false
+}
diff --git a/src/main/kotlin/org/move/lang/core/resolve2/PathKind.kt b/src/main/kotlin/org/move/lang/core/resolve2/PathKind.kt
new file mode 100644
index 000000000..4366e9468
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve2/PathKind.kt
@@ -0,0 +1,136 @@
+package org.move.lang.core.resolve2
+
+import org.move.lang.core.psi.MvPath
+import org.move.lang.core.psi.MvUseGroup
+import org.move.lang.core.psi.MvUseSpeck
+import org.move.lang.core.psi.MvUseStmt
+import org.move.lang.core.psi.ext.allowedNamespaces
+import org.move.lang.core.psi.ext.ancestorStrict
+import org.move.lang.core.psi.ext.isUseSpeck
+import org.move.lang.core.psi.ext.useSpeck
+import org.move.lang.core.resolve.ref.Namespace
+import org.move.lang.core.types.Address
+import org.move.lang.moveProject
+
+sealed class PathKind {
+    // aptos_std:: where aptos_std is a existing named address in a project
+    data class NamedAddress(val address: Address.Named): PathKind()
+
+    // 0x1::
+    data class ValueAddress(val address: Address.Value): PathKind()
+
+    // foo
+    data class UnqualifiedPath(val ns: Set<Namespace>): PathKind()
+
+    // any multi element path
+    sealed class QualifiedPath(val path: MvPath, val qualifier: MvPath, val ns: Set<Namespace>): PathKind() {
+        // `0x1:foo` or `aptos_framework::foo` (where aptos_framework is known named address)
+        class Module(path: MvPath, qualifier: MvPath, ns: Set<Namespace>, val address: Address):
+            QualifiedPath(path, qualifier, ns)
+
+        // bar in foo::bar, where foo is not a named address
+        class ModuleItem(path: MvPath, qualifier: MvPath, ns: Set<Namespace>):
+            QualifiedPath(path, qualifier, ns)
+
+        // bar in `0x1::foo::bar` or `aptos_std::foo::bar` (where aptos_std is known named address)
+        class FQModuleItem(path: MvPath, qualifier: MvPath, ns: Set<Namespace>):
+            QualifiedPath(path, qualifier, ns)
+
+        // use 0x1::m::{item1};
+        //               ^
+        class UseGroupItem(path: MvPath, qualifier: MvPath, ns: Set<Namespace>):
+            QualifiedPath(path, qualifier, ns)
+    }
+}
+
+fun MvPath.pathKind(overwriteNs: Set<Namespace>? = null): PathKind {
+    val ns = overwriteNs ?: this.allowedNamespaces()
+    // [0x1::foo]::bar
+    //     ^ qualifier
+    val qualifier = this.path
+    val moveProject = this.moveProject
+
+    val useGroup = this.ancestorStrict<MvUseGroup>()
+    if (useGroup != null) {
+        // use 0x1::m::{item}
+        //                ^
+        val useSpeckQualifier = (useGroup.parent as MvUseSpeck).path
+        return PathKind.QualifiedPath.UseGroupItem(this, useSpeckQualifier, ns)
+    }
+
+    if (qualifier == null) {
+        // one-element path
+
+        // if pathAddress exists, it means it has to be a value address
+        val pathAddress = this.pathAddress
+        if (pathAddress != null) {
+            return PathKind.ValueAddress(Address.Value(pathAddress.text))
+        }
+        val referenceName = this.referenceName ?: error("if pathAddress is null, reference has to be non-null")
+
+        // check whether it's a first element in use stmt, i.e. use [std]::module;
+        //                                                           ^
+        val useSpeck = this.useSpeck
+        if (useSpeck != null && useSpeck.parent is MvUseStmt) {
+            // if so, local path expr is a named address
+            val namedAddress = moveProject?.getNamedAddressTestAware(referenceName)
+            if (namedAddress != null) {
+                return PathKind.NamedAddress(namedAddress)
+            }
+            // and it can be with null value if absent, still a named address
+            return PathKind.NamedAddress(Address.Named(referenceName, null, moveProject))
+        }
+
+        // check whether it's inside use group, then it cannot be named address
+//        if (this.useSpeck?.useGroup != null) {
+//            return PathKind.UnqualifiedPath(ns)
+//        }
+
+        // outside use stmt context
+        if (moveProject != null) {
+            // try whether it's a named address
+            val namedAddress = moveProject.getNamedAddressTestAware(referenceName)
+            if (namedAddress != null) {
+                return PathKind.NamedAddress(namedAddress)
+            }
+        }
+
+        // if it's not, then it just an unqualified path
+        return PathKind.UnqualifiedPath(ns)
+    }
+
+    val qualifierOfQualifier = qualifier.path
+
+    // two-element paths
+    if (qualifierOfQualifier == null) {
+        val qualifierPathAddress = qualifier.pathAddress
+        val qualifierItemName = qualifier.referenceName
+        when {
+            // 0x1::bar
+            //       ^
+            qualifierPathAddress != null -> {
+                val address = Address.Value(qualifierPathAddress.text)
+                return PathKind.QualifiedPath.Module(this, qualifier, ns, address)
+            }
+            // aptos_framework::bar
+            //                  ^
+            moveProject != null && qualifierItemName != null -> {
+                val namedAddress = moveProject.getNamedAddressTestAware(qualifierItemName)
+                if (namedAddress != null) {
+                    // known named address, can be module path
+                    return PathKind.QualifiedPath.Module(this, qualifier, ns, namedAddress)
+                }
+                if (this.isUseSpeck) {
+                    // use std::main where std is the unknown named address
+                    val address = Address.Named(qualifierItemName, null, moveProject)
+                    return PathKind.QualifiedPath.Module(this, qualifier, ns, address)
+                }
+            }
+        }
+        // module::name
+        return PathKind.QualifiedPath.ModuleItem(this, qualifier, ns)
+    }
+
+    // three-element path
+    return PathKind.QualifiedPath.FQModuleItem(this, qualifier, ns)
+}
diff --git a/src/main/kotlin/org/move/lang/core/resolve2/Visibility2.kt b/src/main/kotlin/org/move/lang/core/resolve2/Visibility2.kt
new file mode 100644
index 000000000..dbe37c32e
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve2/Visibility2.kt
@@ -0,0 +1,115 @@
+package org.move.lang.core.resolve2
+
+import org.move.cli.containingMovePackage
+import org.move.cli.settings.moveSettings
+import org.move.ide.inspections.imports.usageScope
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.NamedItemScope.MAIN
+import org.move.lang.core.psi.ext.*
+import org.move.lang.core.resolve.ModInfo
+import org.move.lang.core.resolve.VisibilityFilter
+import org.move.lang.core.resolve.VisibilityStatus.Invisible
+import org.move.lang.core.resolve.VisibilityStatus.Visible
+import org.move.lang.core.resolve.ref.Namespace.NAME
+import org.move.lang.core.resolve.ref.Namespace.TYPE
+import org.move.lang.core.resolve.ref.Visibility2
+import org.move.lang.core.resolve.ref.Visibility2.*
+
+data class ItemVisibilityInfo(
+    val item: MvNamedElement,
+    val usageScope: NamedItemScope,
+    val vis: Visibility2,
+)
+
+fun MvNamedElement.visInfo(adjustScope: NamedItemScope = MAIN): ItemVisibilityInfo {
+    // todo: can be lazy
+    val itemUsageScope = this.itemScope.shrinkScope(adjustScope)
+    val visibility = (this as? MvVisibilityOwner)?.visibility2 ?: Public
+    return ItemVisibilityInfo(this, usageScope = itemUsageScope, vis = visibility)
+}
+
+/** Creates filter which determines whether item with [this] visibility is visible from specific [ModInfo] */
+fun ItemVisibilityInfo.createFilter(): VisibilityFilter {
+    val (item, itemUsageScope, visibility) = this
+    return VisibilityFilter { element, namespaces ->
+
+        // inside msl everything is visible
+        if (element.isMsl()) return@VisibilityFilter Visible
+
+        // types are always visible, their correct usage is checked in a separate inspection
+        if (namespaces.contains(TYPE)) return@VisibilityFilter Visible
+
+        // if inside MvAttrItem like abort_code=
+        val attrItem = element.ancestorStrict<MvAttrItem>()
+        if (attrItem != null) return@VisibilityFilter Visible
+
+        val pathUsageScope = element.usageScope
+
+        val path = element as? MvPath
+        if (path != null) {
+            val useSpeck = path.useSpeck
+            if (useSpeck != null) {
+                // inside import, all visibilities except for private work
+                if (visibility !is Private) return@VisibilityFilter Visible
+
+                // msl-only items are available from imports
+                if (item.isMslOnlyItem) return@VisibilityFilter Visible
+
+                // consts are importable in tests
+                if (pathUsageScope.isTest && namespaces.contains(NAME)) return@VisibilityFilter Visible
+            }
+        }
+
+        // #[test] functions cannot be used from non-imports
+        if (item is MvFunction && item.hasTestAttr) return@VisibilityFilter Invisible
+
+        val itemModule = item.containingModule
+        // 0x0::builtins module items are always visible
+        if (itemModule != null && itemModule.isBuiltins) return@VisibilityFilter Visible
+
+        // #[test_only] items in non-test-only scope
+        if (itemUsageScope != MAIN) {
+            // cannot be used everywhere, need to check for scope compatibility
+            if (itemUsageScope != pathUsageScope) return@VisibilityFilter Invisible
+        }
+
+        // we're in non-msl scope at this point, msl only items aren't available
+        if (item is MslOnlyElement) return@VisibilityFilter Invisible
+
+        val pathModule = element.containingModule
+        // local methods, Self::method - everything is visible
+        if (itemModule == pathModule) return@VisibilityFilter Visible
+
+        when (visibility) {
+            is Restricted -> {
+                when (visibility) {
+                    is Restricted.Friend -> {
+                        if (pathModule != null) {
+                            val friendModules = visibility.friendModules.value
+                            if (friendModules.any { isModulesEqual(it, pathModule) }) return@VisibilityFilter Visible
+                        }
+                        Invisible
+                    }
+                    is Restricted.Script -> {
+                        val containingFunction = element.containingFunction
+                        if (containingFunction != null) {
+                            if (containingFunction.isEntry || containingFunction.isPublicScript
+                            ) return@VisibilityFilter Visible
+                        }
+                        if (element.containingScript != null) return@VisibilityFilter Visible
+                        Invisible
+                    }
+                    is Restricted.Package -> {
+                        if (!item.project.moveSettings.enablePublicPackage) {
+                            return@VisibilityFilter Invisible
+                        }
+                        val pathPackage = element.containingMovePackage ?: return@VisibilityFilter Invisible
+                        if (visibility.originPackage == pathPackage) Visible else Invisible
+                    }
+                }
+            }
+            is Public -> Visible
+            is Private -> Invisible
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/lang/core/resolve2/ref/Path2ReferenceImpl.kt b/src/main/kotlin/org/move/lang/core/resolve2/ref/Path2ReferenceImpl.kt
new file mode 100644
index 000000000..9774c8bd2
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve2/ref/Path2ReferenceImpl.kt
@@ -0,0 +1,157 @@
+package org.move.lang.core.resolve2.ref
+
+import com.intellij.psi.ResolveResult
+import org.move.cli.MoveProject
+import org.move.lang.core.psi.*
+import org.move.lang.core.psi.ext.MvMethodOrPath
+import org.move.lang.core.psi.ext.useSpeck
+import org.move.lang.core.resolve.*
+import org.move.lang.core.resolve.ref.*
+import org.move.lang.core.resolve2.*
+import org.move.lang.core.resolve2.PathKind.NamedAddress
+import org.move.lang.core.resolve2.PathKind.ValueAddress
+import org.move.lang.moveProject
+import kotlin.LazyThreadSafetyMode.NONE
+
+class Path2ReferenceImpl(element: MvPath):
+    MvPolyVariantReferenceBase<MvPath>(element), MvPath2Reference {
+
+    override fun resolve(): MvNamedElement? =
+        rawMultiResolveIfVisible().singleOrNull()?.element as? MvNamedElement
+
+    override fun multiResolve(): List<MvNamedElement> =
+        rawMultiResolveIfVisible().mapNotNull { it.element as? MvNamedElement }
+
+    override fun multiResolve(incompleteCode: Boolean): Array<out ResolveResult> =
+        rawMultiResolve().toTypedArray()
+
+//    fun multiResolveIfVisible(): List<MvElement> =
+//        rawMultiResolve().mapNotNull {
+//            if (!it.isVisible) return@mapNotNull null
+//            it.element
+//        }
+
+    fun rawMultiResolveIfVisible(): List<RsPathResolveResult<MvElement>> =
+        rawMultiResolve().filter { it.isVisible }
+
+    //    fun rawMultiResolve(): List<RsPathResolveResult<MvElement>> = Resolver.invoke(this.element)
+    fun rawMultiResolve(): List<RsPathResolveResult<MvElement>> = rawCachedMultiResolve()
+
+    private fun rawCachedMultiResolve(): List<RsPathResolveResult<MvElement>> {
+        val rawResult = MvResolveCache.getInstance(element.project)
+            .resolveWithCaching(element, ResolveCacheDependency.LOCAL_AND_RUST_STRUCTURE, Resolver)
+        return rawResult.orEmpty()
+    }
+
+    private object Resolver: (MvElement) -> List<RsPathResolveResult<MvElement>> {
+        override fun invoke(path: MvElement): List<RsPathResolveResult<MvElement>> {
+            // should not really happen
+            if (path !is MvPath) return emptyList()
+            val resolutionCtx = ResolutionContext(path, isCompletion = false)
+            return resolvePath(resolutionCtx, path)
+        }
+    }
+}
+
+fun processPathResolveVariants(
+    ctx: ResolutionContext,
+    pathKind: PathKind,
+    processor: RsResolveProcessor
+): Boolean {
+    return when (pathKind) {
+        is NamedAddress, is ValueAddress -> false
+        is PathKind.UnqualifiedPath -> {
+            // Self::
+            if (processor.lazy("Self") { ctx.containingModule }) return true
+            // local
+            processNestedScopesUpwards(ctx.element, pathKind.ns, ctx, processor)
+        }
+        is PathKind.QualifiedPath.Module -> {
+            processModulePathResolveVariants(ctx, pathKind.address, processor)
+        }
+        is PathKind.QualifiedPath -> {
+            processQualifiedPathResolveVariants(ctx, pathKind.ns, pathKind.qualifier, processor)
+        }
+    }
+}
+
+/**
+ * foo::bar
+ * |    |
+ * |    [path]
+ * [qualifier]
+ */
+fun processQualifiedPathResolveVariants(
+    ctx: ResolutionContext,
+    ns: Set<Namespace>,
+    qualifier: MvPath,
+    processor: RsResolveProcessor
+): Boolean {
+    val resolvedQualifier = qualifier.reference?.resolveFollowingAliases()
+    if (resolvedQualifier == null) {
+        if (Namespace.MODULE in ns) {
+            // can be module, try for named address as a qualifier
+            val addressName = qualifier.referenceName ?: return false
+            val address = ctx.moveProject?.getNamedAddressTestAware(addressName) ?: return false
+            if (processModulePathResolveVariants(ctx, address, processor)) return true
+        }
+        return false
+    }
+    if (resolvedQualifier is MvModule) {
+        if (processor.process("Self", resolvedQualifier)) return true
+
+        val moduleBlock = resolvedQualifier.moduleBlock
+        if (moduleBlock != null) {
+            if (processItemDeclarations(moduleBlock, ns, processor)) return true
+        }
+    }
+    return false
+}
+
+class ResolutionContext(val element: MvElement, val isCompletion: Boolean) {
+
+    private var lazyContainingMoveProject: Lazy<MoveProject?> = lazy(NONE) {
+        element.moveProject
+    }
+    val moveProject: MoveProject? get() = lazyContainingMoveProject.value
+
+    private var lazyContainingModule: Lazy<MvModule?> = lazy(NONE) {
+        element.containingModule
+    }
+    val containingModule: MvModule? get() = lazyContainingModule.value
+
+    private var lazyUseSpeck: Lazy<MvUseSpeck?> = lazy(NONE) { path?.useSpeck }
+    val useSpeck: MvUseSpeck? get() = lazyUseSpeck.value
+    val isUseSpeck: Boolean get() = useSpeck != null
+
+    val methodOrPath: MvMethodOrPath? get() = element as? MvMethodOrPath
+    val path: MvPath? get() = element as? MvPath
+}
+
+//// todo: use in inference later
+//fun resolvePathRaw(path: MvPath): List<ScopeEntry> {
+//    return collectResolveVariantsAsScopeEntries(path.referenceName) {
+//        processPathResolveVariants(path, it)
+//    }
+//}
+
+private fun resolvePath(
+    ctx: ResolutionContext,
+    path: MvPath,
+//    kind: RsPathResolveKind
+): List<RsPathResolveResult<MvElement>> {
+    val pathKind = path.pathKind()
+    val result =
+        // matches resolve variants against referenceName from path
+        collectMethodOrPathResolveVariants(path, ctx) {
+            // actually emits resolve variants
+            processPathResolveVariants(ctx, pathKind, it)
+        }
+    return result
+//    return when (result.size) {
+//        0 -> emptyList()
+//        1 -> listOf(result.single())
+//        else -> result
+//    }
+}
+
diff --git a/src/main/kotlin/org/move/lang/core/resolve2/ref/RsPathResolveResult.kt b/src/main/kotlin/org/move/lang/core/resolve2/ref/RsPathResolveResult.kt
new file mode 100644
index 000000000..1021cf5d3
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve2/ref/RsPathResolveResult.kt
@@ -0,0 +1,19 @@
+package org.move.lang.core.resolve2.ref
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.ResolveResult
+import org.move.lang.core.psi.MvElement
+
+/**
+ * Used as a resolve result in [org.rust.lang.core.resolve.ref.RsPathReferenceImpl]
+ */
+data class RsPathResolveResult<T: MvElement>(
+    val element: T,
+//    val resolvedSubst: Substitution = emptySubstitution,
+    val isVisible: Boolean,
+//    val namespaces: Set<Namespace> = emptySet(),
+): ResolveResult {
+    override fun getElement(): PsiElement = element
+
+    override fun isValidResult(): Boolean = true
+}
diff --git a/src/main/kotlin/org/move/lang/core/resolve2/util/PathUtil.kt b/src/main/kotlin/org/move/lang/core/resolve2/util/PathUtil.kt
new file mode 100644
index 000000000..d5a970a80
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/core/resolve2/util/PathUtil.kt
@@ -0,0 +1,27 @@
+package org.move.lang.core.resolve2.util
+
+import org.move.lang.core.psi.MvPath
+import org.move.lang.core.psi.MvUseAlias
+import org.move.lang.core.psi.MvUseSpeck
+import org.move.lang.core.psi.MvUseStmt
+import org.move.lang.core.psi.ext.childOfType
+import org.move.lang.core.psi.ext.childrenOfType
+
+fun interface LeafUseSpeckConsumer {
+    fun consume(path: MvPath, useAlias: MvUseAlias?): Boolean
+}
+
+fun MvUseStmt.forEachLeafSpeck(consumer: LeafUseSpeckConsumer) {
+    val rootUseSpeck = this.childOfType<MvUseSpeck>() ?: return
+    val useGroup = rootUseSpeck.useGroup
+    if (useGroup == null) {
+        // basePath is null, path is full path of useSpeck
+        val alias = rootUseSpeck.useAlias
+        if (!consumer.consume(rootUseSpeck.path, alias)) return
+    } else {
+        for (childSpeck in useGroup.childrenOfType<MvUseSpeck>()) {
+            val alias = childSpeck.useAlias
+            if (!consumer.consume(childSpeck.path, alias)) continue
+        }
+    }
+}
diff --git a/src/main/kotlin/org/move/lang/core/stubs/StubIndexing.kt b/src/main/kotlin/org/move/lang/core/stubs/StubIndexing.kt
index 32d899f9f..cc1d05afc 100644
--- a/src/main/kotlin/org/move/lang/core/stubs/StubIndexing.kt
+++ b/src/main/kotlin/org/move/lang/core/stubs/StubIndexing.kt
@@ -6,6 +6,9 @@ import org.move.lang.index.*
 import org.move.lang.moveProject
 
 fun IndexSink.indexModuleStub(stub: MvModuleStub) {
+    stub.name?.let {
+        occurrence(MvModuleIndex.KEY, it)
+    }
     indexNamedStub(stub)
 }
 
diff --git a/src/main/kotlin/org/move/lang/core/stubs/Stubs.kt b/src/main/kotlin/org/move/lang/core/stubs/Stubs.kt
index 780a69729..6b57bd873 100644
--- a/src/main/kotlin/org/move/lang/core/stubs/Stubs.kt
+++ b/src/main/kotlin/org/move/lang/core/stubs/Stubs.kt
@@ -363,7 +363,7 @@ class MvModuleSpecStub(
             MvModuleSpecImpl(stub, this)
 
         override fun createStub(psi: MvModuleSpec, parentStub: StubElement<*>?): MvModuleSpecStub {
-            return MvModuleSpecStub(parentStub, this, psi.fqModuleRef?.referenceName)
+            return MvModuleSpecStub(parentStub, this, psi.path?.referenceName)
         }
 
         override fun indexStub(stub: MvModuleSpecStub, sink: IndexSink) = sink.indexModuleSpecStub(stub)
diff --git a/src/main/kotlin/org/move/lang/core/stubs/impl/MvFileStub.kt b/src/main/kotlin/org/move/lang/core/stubs/impl/MvFileStub.kt
index dc61c4bb6..9cf7ac2c4 100644
--- a/src/main/kotlin/org/move/lang/core/stubs/impl/MvFileStub.kt
+++ b/src/main/kotlin/org/move/lang/core/stubs/impl/MvFileStub.kt
@@ -17,7 +17,7 @@ class MvFileStub(file: MoveFile?) : PsiFileStubImpl<MoveFile>(file) {
     override fun getType() = Type
 
     object Type : IStubFileElementType<MvFileStub>(MoveLanguage) {
-        private const val STUB_VERSION = 24
+        private const val STUB_VERSION = 25
 
         // Bump this number if Stub structure changes
         override fun getStubVersion(): Int = MoveParserDefinition.PARSER_VERSION + STUB_VERSION
diff --git a/src/main/kotlin/org/move/lang/core/types/Address.kt b/src/main/kotlin/org/move/lang/core/types/Address.kt
index caa0ea60a..f5c8e3a19 100644
--- a/src/main/kotlin/org/move/lang/core/types/Address.kt
+++ b/src/main/kotlin/org/move/lang/core/types/Address.kt
@@ -7,6 +7,8 @@ import org.move.lang.core.psi.MvAddressRef
 import org.move.lang.core.psi.MvModule
 import org.move.lang.core.psi.ext.addressRef
 import org.move.lang.core.psi.ext.greenStub
+import org.move.lang.core.types.Address.Named
+import org.move.lang.core.types.Address.Value
 import org.move.lang.core.types.AddressLit.Companion.normalizeValue
 
 const val MAX_LENGTH = 32
@@ -40,31 +42,35 @@ class AddressLit(val original: String) {
 
 sealed class Address {
 
-    abstract fun canonicalValue(moveProject: MoveProject): String?
     abstract fun text(): String
+    abstract fun canonicalValue(moveProject: MoveProject): String?
+
+    val is0x0 get() = this is Value && this.addressLit().original == "0x0"
 
-    class Value(private val value: String) : Address() {
+    class Value(private val value: String): Address() {
         fun addressLit(): AddressLit = AddressLit(value)
 
         override fun canonicalValue(moveProject: MoveProject): String = this.addressLit().canonical()
 
         override fun text(): String = this.addressLit().original
 
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (other !is Value) return false
-            if (this.hashCode() != other.hashCode()) return false
-            return eq(this, other)
-        }
+//        override fun equals(other: Any?): Boolean {
+//            if (this === other) return true
+//            if (other !is Value) return false
+//            if (this.hashCode() != other.hashCode()) return false
+//            return eq(this, other)
+//        }
+
+//        override fun hashCode(): Int = normalizeValue(value).hashCode()
 
-        override fun hashCode(): Int = normalizeValue(value).hashCode()
+        override fun toString(): String = "Address.Value($value)"
     }
 
     class Named(
         val name: String,
-        private val value: String?,
+        val value: String?,
         private val declMoveProject: MoveProject?
-    ) : Address() {
+    ): Address() {
         fun value(moveProject: MoveProject? = null): String {
             return value
                 ?: this.declMoveProject?.getNamedAddressValue(name)
@@ -75,43 +81,57 @@ sealed class Address {
         fun addressLit(moveProject: MoveProject): AddressLit? =
             moveProject.getNamedAddressValue(this.name)?.let { AddressLit(it) }
 
-        override fun canonicalValue(moveProject: MoveProject): String? = this.addressLit(moveProject)?.canonical()
+        override fun canonicalValue(moveProject: MoveProject): String? =
+            this.addressLit(moveProject)?.canonical()
 
         override fun text(): String = "$name = ${value()}"
 
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (other !is Named) return false
-            if (this.hashCode() != other.hashCode()) return false
-            return eq(this, other)
-        }
+//        override fun equals(other: Any?): Boolean {
+//            if (this === other) return true
+//            if (other !is Named) return false
+////            if (this.hashCode() != other.hashCode()) return false
+//            return eq(this, other)
+//        }
 
-        override fun hashCode(): Int = name.hashCode()
+//        override fun hashCode(): Int = name.hashCode()
     }
 
     companion object {
         const val UNKNOWN: String = "0x0"
 
-        fun eq(left: Address?, right: Address?): Boolean {
+        fun equals(left: Address?, right: Address?): Boolean {
             if (left === right) return true
             if (left == null && right == null) return true
             return when {
-                left is Value && right is Value -> left.addressLit().canonical() == right.addressLit().canonical()
-                left is Named && right is Named ->
-                    Pair(left.name, normalizeValue(left.value())) == Pair(
-                        right.name,
-                        normalizeValue(right.value())
-                    )
+                left is Value && right is Value ->
+                    left.addressLit().canonical() == right.addressLit().canonical()
+                left is Named && right is Named -> {
+                    val leftValue = left.value?.let { normalizeValue(it) }
+                    val rightValue = right.value?.let { normalizeValue(it) }
+                    if (leftValue == null && rightValue == null) {
+                        // null items cannot be equal
+                        return false
+                    }
+                    return leftValue == rightValue
+                }
+                left is Value && right is Named -> checkValueNamedEquals(left, right)
+                left is Named && right is Value -> checkValueNamedEquals(right, left)
                 else -> false
             }
         }
+
+        private fun checkValueNamedEquals(value: Value, named: Named): Boolean {
+            val normalizedValue = value.addressLit().canonical()
+            val normalizedNamed = named.value?.let { normalizeValue(it) }
+            return normalizedValue == normalizedNamed
+        }
     }
 }
 
 sealed class StubAddress {
-    object Unknown : StubAddress()
-    data class Value(val value: String) : StubAddress()
-    data class Named(val name: String) : StubAddress()
+    object Unknown: StubAddress()
+    data class Value(val value: String): StubAddress()
+    data class Named(val name: String): StubAddress()
 
     fun asInt(): Int {
         return when (this) {
@@ -125,9 +145,13 @@ sealed class StubAddress {
         return when (this) {
             is Named -> {
                 if (moveProject == null) {
-                    Address.Named(this.name, null, null)
+                    Named(this.name, null, null)
                 } else {
-                    moveProject.getNamedAddress(this.name)
+                    moveProject.getNamedAddressTestAware(this.name) ?: Named(
+                        this.name,
+                        null,
+                        moveProject
+                    )
                 }
             }
             is Value -> Address.Value(this.value)
diff --git a/src/main/kotlin/org/move/lang/core/types/infer/ExpectedType.kt b/src/main/kotlin/org/move/lang/core/types/infer/ExpectedType.kt
index d675bf4b6..fbc26f792 100644
--- a/src/main/kotlin/org/move/lang/core/types/infer/ExpectedType.kt
+++ b/src/main/kotlin/org/move/lang/core/types/infer/ExpectedType.kt
@@ -27,7 +27,7 @@ fun inferExpectedTypeArgumentTy(typeArgument: MvTypeArgument): Ty? {
             if (paramIndex == -1) return null
 
             val path = typeArgumentList.parent as MvPath
-            val genericItem = path.reference?.resolveWithAliases() as? MvTypeParametersOwner ?: return null
+            val genericItem = path.reference?.resolveFollowingAliases() as? MvTypeParametersOwner ?: return null
             genericItem.typeParameters
                 .getOrNull(paramIndex)
                 ?.let { TyInfer.TyVar(TyTypeParameter(it)) }
diff --git a/src/main/kotlin/org/move/lang/core/types/infer/InferenceContext.kt b/src/main/kotlin/org/move/lang/core/types/infer/InferenceContext.kt
index 22dfb50b6..ef287c69f 100644
--- a/src/main/kotlin/org/move/lang/core/types/infer/InferenceContext.kt
+++ b/src/main/kotlin/org/move/lang/core/types/infer/InferenceContext.kt
@@ -72,6 +72,7 @@ data class InferenceResult(
     private val exprTypes: Map<MvExpr, Ty>,
     private val exprExpectedTypes: Map<MvExpr, Ty>,
     private val methodOrPathTypes: Map<MvMethodOrPath, Ty>,
+//    private val resolvedPaths: Map<MvPath, List<ResolvedPath>>,
     private val resolvedFields: Map<MvStructDotField, MvNamedElement?>,
     private val resolvedMethodCalls: Map<MvMethodCall, MvNamedElement?>,
     val callableTypes: Map<MvCallable, Ty>,
@@ -90,6 +91,9 @@ data class InferenceResult(
     fun getCallableType(callable: MvCallable): Ty? = callableTypes[callable]
     fun getMethodOrPathType(methodOrPath: MvMethodOrPath): Ty? = methodOrPathTypes[methodOrPath]
 
+//    fun getResolvedPath(path: MvPath): List<ResolvedPath> =
+//        resolvedPaths[path] ?: emptyList()
+
     fun getResolvedField(field: MvStructDotField): MvNamedElement? = resolvedFields[field]
     fun getResolvedMethod(methodCall: MvMethodCall): MvNamedElement? = resolvedMethodCalls[methodCall]
 }
@@ -136,6 +140,19 @@ fun MvElement.inference(msl: Boolean): InferenceResult? {
     return contextOwner.inference(msl)
 }
 
+//data class ResolvedPath(val element: MvElement, val isVisible: Boolean) {
+//    companion object {
+//        fun from(entry: ScopeEntry, context: MvElement): ResolvedPath {
+////            return if (entry is AssocItemScopeEntry) {
+////                AssocItem(entry.element, entry.source)
+////            } else {
+////            val isVisible = entry.isVisibleFrom(context.containingModule)
+//            return ResolvedPath(entry.element, true)
+////            }
+//        }
+//    }
+//}
+
 class InferenceContext(
     var msl: Boolean,
     private val skipUnification: Boolean = false
@@ -150,6 +167,7 @@ class InferenceContext(
     //    private val pathTypes = mutableMapOf<MvPath, Ty>()
     private val methodOrPathTypes = mutableMapOf<MvMethodOrPath, Ty>()
 
+//    val resolvedPaths = mutableMapOf<MvPath, List<ResolvedPath>>()
     val resolvedFields = mutableMapOf<MvStructDotField, MvNamedElement?>()
     val resolvedMethodCalls = mutableMapOf<MvMethodCall, MvNamedElement?>()
 
@@ -209,6 +227,7 @@ class InferenceContext(
             exprTypes,
             exprExpectedTypes,
             methodOrPathTypes,
+//            resolvedPaths,
             resolvedFields,
             resolvedMethodCalls,
             callableTypes,
@@ -256,6 +275,10 @@ class InferenceContext(
         this.callableTypes[callable] = ty
     }
 
+//    fun writePath(path: MvPath, resolved: List<ResolvedPath>) {
+//        resolvedPaths[path] = resolved
+//    }
+
     @Suppress("UNCHECKED_CAST")
     fun <T: GenericTy> instantiateMethodOrPath(
         methodOrPath: MvMethodOrPath,
diff --git a/src/main/kotlin/org/move/lang/core/types/infer/TyLowering.kt b/src/main/kotlin/org/move/lang/core/types/infer/TyLowering.kt
index 4ff23777c..5f1e16336 100644
--- a/src/main/kotlin/org/move/lang/core/types/infer/TyLowering.kt
+++ b/src/main/kotlin/org/move/lang/core/types/infer/TyLowering.kt
@@ -13,7 +13,7 @@ class TyLowering {
     fun lowerTy(moveType: MvType, msl: Boolean): Ty {
         return when (moveType) {
             is MvPathType -> {
-                val genericItem = moveType.path.reference?.resolveWithAliases()
+                val genericItem = moveType.path.reference?.resolveFollowingAliases()
                 lowerPath(moveType.path, genericItem, msl)
             }
             is MvRefType -> {
diff --git a/src/main/kotlin/org/move/lang/core/types/infer/TypeInferenceWalker.kt b/src/main/kotlin/org/move/lang/core/types/infer/TypeInferenceWalker.kt
index c1a345bba..4abd2066f 100644
--- a/src/main/kotlin/org/move/lang/core/types/infer/TypeInferenceWalker.kt
+++ b/src/main/kotlin/org/move/lang/core/types/infer/TypeInferenceWalker.kt
@@ -9,8 +9,10 @@ import org.move.cli.settings.moveSettings
 import org.move.ide.formatter.impl.location
 import org.move.lang.core.psi.*
 import org.move.lang.core.psi.ext.*
+import org.move.lang.core.resolve.collectMethodOrPathResolveVariants
+import org.move.lang.core.resolve2.processMethodResolveVariants
+import org.move.lang.core.resolve2.ref.ResolutionContext
 import org.move.lang.core.types.ty.*
-import org.move.lang.core.types.ty.TyInfer.TyVar
 import org.move.lang.core.types.ty.TyReference.Companion.autoborrow
 import org.move.stdext.RsResult
 import org.move.stdext.chain
@@ -291,7 +293,7 @@ class TypeInferenceWalker(
                 return funcItem.rawReturnType(true)
             }
         }
-        val item = refExpr.path.reference?.resolveWithAliases() ?: return TyUnknown
+        val item = refExpr.path.reference?.resolveFollowingAliases() ?: return TyUnknown
         val ty = when (item) {
             is MvBindingPat -> ctx.getPatType(item)
             is MvConst -> item.type?.loweredType(msl) ?: TyUnknown
@@ -353,7 +355,7 @@ class TypeInferenceWalker(
 
     private fun inferCallExprTy(callExpr: MvCallExpr, expected: Expectation): Ty {
         val path = callExpr.path
-        val item = path.reference?.resolveWithAliases()
+        val item = path.reference?.resolveFollowingAliases()
         val baseTy =
             when (item) {
                 is MvFunctionLike -> {
@@ -413,10 +415,14 @@ class TypeInferenceWalker(
     }
 
     fun inferMethodCallTy(receiverTy: Ty, methodCall: MvMethodCall, expected: Expectation): Ty {
-        val refName = methodCall.referenceName
-        val methodVariants = getMethodVariants(methodCall, receiverTy, ctx.msl)
-        val genericItem = methodVariants.filterByName(refName).firstOrNull()
 
+        val resolutionCtx = ResolutionContext(methodCall, isCompletion = false)
+        val resolvedMethods =
+            collectMethodOrPathResolveVariants(methodCall, resolutionCtx) {
+                processMethodResolveVariants(methodCall, receiverTy, msl, it)
+            }
+        val genericItem =
+            resolvedMethods.filter { it.isVisible }.mapNotNull { it.element as? MvNamedElement }.firstOrNull()
         ctx.resolvedMethodCalls[methodCall] = genericItem
 
         val baseTy =
diff --git a/src/main/kotlin/org/move/lang/index/MvModuleIndex.kt b/src/main/kotlin/org/move/lang/index/MvModuleIndex.kt
new file mode 100644
index 000000000..6d77c673f
--- /dev/null
+++ b/src/main/kotlin/org/move/lang/index/MvModuleIndex.kt
@@ -0,0 +1,53 @@
+package org.move.lang.index
+
+import com.intellij.openapi.project.Project
+import com.intellij.psi.search.GlobalSearchScope
+import com.intellij.psi.stubs.StringStubIndexExtension
+import com.intellij.psi.stubs.StubIndex
+import com.intellij.psi.stubs.StubIndexKey
+import org.move.lang.core.psi.MvModule
+import org.move.lang.core.stubs.impl.MvFileStub
+import org.move.openapiext.checkCommitIsNotInProgress
+
+class MvModuleIndex: StringStubIndexExtension<MvModule>() {
+    override fun getVersion(): Int = MvFileStub.Type.stubVersion
+    override fun getKey(): StubIndexKey<String, MvModule> = KEY
+
+    companion object {
+        val KEY: StubIndexKey<String, MvModule> =
+            StubIndexKey.createIndexKey("org.move.index.ModuleIndex")
+
+        fun getAllModuleNames(project: Project): Collection<String> {
+            checkCommitIsNotInProgress(project)
+            return StubIndex.getInstance().getAllKeys(KEY, project)
+        }
+
+        fun processModulesByName(
+            project: Project,
+            target: String,
+            scope: GlobalSearchScope = GlobalSearchScope.allScope(project),
+            processor: (MvModule) -> Boolean,
+        ) {
+            checkCommitIsNotInProgress(project)
+            StubIndex.getInstance()
+                .processElements(KEY, target, project, scope, MvModule::class.java, processor)
+        }
+
+        fun getModulesByName(
+            project: Project,
+            name: String,
+            scope: GlobalSearchScope,
+        ): Collection<MvModule> {
+            checkCommitIsNotInProgress(project)
+            return StubIndex.getElements(KEY, name, project, scope, MvModule::class.java)
+        }
+
+        fun getModuleByName(
+            project: Project,
+            name: String,
+            scope: GlobalSearchScope,
+        ): MvModule? {
+            return getModulesByName(project, name, scope).singleOrNull()
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/org/move/lang/index/MvModuleSpecIndex.kt b/src/main/kotlin/org/move/lang/index/MvModuleSpecIndex.kt
index ec547ebe6..b34b9476f 100644
--- a/src/main/kotlin/org/move/lang/index/MvModuleSpecIndex.kt
+++ b/src/main/kotlin/org/move/lang/index/MvModuleSpecIndex.kt
@@ -9,7 +9,7 @@ import org.move.lang.core.stubs.impl.MvFileStub
 import org.move.openapiext.checkCommitIsNotInProgress
 import org.move.openapiext.getElements
 
-class MvModuleSpecIndex : StringStubIndexExtension<MvModuleSpec>() {
+class MvModuleSpecIndex: StringStubIndexExtension<MvModuleSpec>() {
     override fun getVersion(): Int = MvFileStub.Type.stubVersion
     override fun getKey(): StubIndexKey<String, MvModuleSpec> = KEY
 
diff --git a/src/main/kotlin/org/move/lang/index/MvNamedElementIndex.kt b/src/main/kotlin/org/move/lang/index/MvNamedElementIndex.kt
index 54e7500a4..ce91c7001 100644
--- a/src/main/kotlin/org/move/lang/index/MvNamedElementIndex.kt
+++ b/src/main/kotlin/org/move/lang/index/MvNamedElementIndex.kt
@@ -9,7 +9,7 @@ import org.move.lang.core.psi.MvNamedElement
 import org.move.lang.core.stubs.impl.MvFileStub
 import org.move.openapiext.checkCommitIsNotInProgress
 
-class MvNamedElementIndex : StringStubIndexExtension<MvNamedElement>() {
+class MvNamedElementIndex: StringStubIndexExtension<MvNamedElement>() {
     override fun getVersion(): Int = MvFileStub.Type.stubVersion
     override fun getKey(): StubIndexKey<String, MvNamedElement> = KEY
 
diff --git a/src/main/kotlin/org/move/lang/utils/Diagnostic.kt b/src/main/kotlin/org/move/lang/utils/Diagnostic.kt
index 81451bd59..2e5a62933 100644
--- a/src/main/kotlin/org/move/lang/utils/Diagnostic.kt
+++ b/src/main/kotlin/org/move/lang/utils/Diagnostic.kt
@@ -16,7 +16,6 @@ import org.move.ide.annotator.pluralise
 import org.move.ide.inspections.fixes.CompilerV2Feat.*
 import org.move.ide.inspections.fixes.EnableCompilerV2FeatureFix
 import org.move.lang.core.psi.*
-import org.move.lang.core.psi.ext.dotExpr
 import org.move.lang.core.psi.ext.endOffset
 import org.move.lang.core.psi.ext.itemSpecBlock
 import org.move.lang.core.psi.ext.startOffset
diff --git a/src/main/kotlin/org/move/openapiext/utils.kt b/src/main/kotlin/org/move/openapiext/utils.kt
index 5783a65e6..fcd12d210 100644
--- a/src/main/kotlin/org/move/openapiext/utils.kt
+++ b/src/main/kotlin/org/move/openapiext/utils.kt
@@ -102,13 +102,6 @@ fun saveAllDocumentsAsTheyAre() {
 //    }
 }
 
-inline fun testAssert(action: () -> Boolean, lazyMessage: () -> Any) {
-    if (isUnitTestMode && !action()) {
-        val message = lazyMessage()
-        throw AssertionError(message)
-    }
-}
-
 val DataContext.psiFile: PsiFile?
     get() = getData(CommonDataKeys.PSI_FILE)
 
@@ -242,4 +235,15 @@ fun joinPathArray(segments: Array<String>) =
     segments.joinTo(StringBuilder(), Platform.current().fileSeparator.toString()).toString()
 
 fun joinPath(vararg segments: String) =
-    segments.joinTo(StringBuilder(), Platform.current().fileSeparator.toString()).toString()
\ No newline at end of file
+    segments.joinTo(StringBuilder(), Platform.current().fileSeparator.toString()).toString()
+
+inline fun testAssert(action: () -> Boolean) {
+    testAssert(action) { "Assertion failed" }
+}
+
+inline fun testAssert(action: () -> Boolean, lazyMessage: () -> Any) {
+    if (isUnitTestMode && !action()) {
+        val message = lazyMessage()
+        throw AssertionError(message)
+    }
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 1348c02cf..e7bc6e6ed 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin
     require-restart="true"
-    xmlns:xi="http://www.w3.org/2001/XInclude">
+>
   <id>org.move.lang</id>
   <name>Move on Aptos</name>
 
@@ -45,6 +45,11 @@
 
     <projectService serviceImplementation="org.move.cli.settings.MvProjectSettingsService" />
 
+    <!-- specifically to support named addresses in tests, does nothing in non-test environment -->
+    <projectService serviceInterface="org.move.cli.tests.NamedAddressService"
+                    serviceImplementation="org.move.cli.tests.NamedAddressServiceImpl"
+                    testServiceImplementation="org.move.cli.tests.NamedAddressServiceTestImpl" />
+
     <configurationType
         implementation="org.move.cli.runConfigurations.aptos.AptosCommandConfigurationType" />
     <configurationType
@@ -68,6 +73,7 @@
     <stubIndex implementation="org.move.lang.index.MvEntryFunctionIndex" />
     <stubIndex implementation="org.move.lang.index.MvViewFunctionIndex" />
     <stubIndex implementation="org.move.lang.index.MvTestFunctionIndex" />
+    <stubIndex implementation="org.move.lang.index.MvModuleIndex" />
     <stubIndex implementation="org.move.lang.index.MvModuleSpecIndex" />
 
     <lang.documentationProvider language="Move"
@@ -152,7 +158,7 @@
     <annotator language="Move"
                implementationClass="org.move.ide.annotator.HighlightingAnnotator" />
 
-    <highlightingPassFactory implementation="org.move.ide.annotator.RsHighlightingPassFactoryRegistrar"/>
+    <highlightingPassFactory implementation="org.move.ide.annotator.RsHighlightingPassFactoryRegistrar" />
 
     <annotator language="TOML"
                implementationClass="org.move.toml.MoveTomlErrorAnnotator" />
@@ -199,7 +205,7 @@
 
     <statusBarWidgetFactory id="moveExternalLinterWidget"
                             implementation="org.move.cli.externalLinter.RsExternalLinterWidgetFactory"
-                            order="first"/>
+                            order="first" />
 
 
     <!--        <localInspection language="Move" groupPath="Move" groupName="Naming"-->
@@ -235,10 +241,6 @@
                      displayName="Local variable naming convention"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.move.ide.inspections.MvLocalBindingNamingInspection" />
-    <localInspection language="Move" groupName="Move"
-                     displayName="Redundant qualifier"
-                     enabledByDefault="false" level="WARNING"
-                     implementationClass="org.move.ide.inspections.RedundantQualifiedPathInspection" />
     <localInspection language="Move" groupName="Move"
                      displayName="Type checking"
                      enabledByDefault="true" level="ERROR"
@@ -271,10 +273,6 @@
                      displayName="Unused test signer"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="org.move.ide.inspections.UnusedTestSignerInspection" />
-    <localInspection language="Move" groupName="Move"
-                     displayName="Address by value inspection"
-                     enabledByDefault="false" level="WEAK WARNING"
-                     implementationClass="org.move.ide.inspections.AddressByValueImportInspection" />
     <localInspection language="Move" groupName="Move"
                      displayName="Redundant type cast"
                      enabledByDefault="true" level="WARNING"
@@ -292,7 +290,7 @@
     <globalInspection language="Move" groupName="Move"
                       enabledByDefault="true" level="ERROR"
                       implementationClass="org.move.ide.inspections.MvExternalLinterInspection"
-                      displayName="External linter"/>
+                      displayName="External linter" />
 
     <!-- Color Settings -->
     <colorSettingsPage implementation="org.move.ide.colors.MvColorSettingsPage" />
@@ -312,9 +310,9 @@
 
     <postStartupActivity
         implementation="org.move.ide.newProject.projectActivity.AlwaysRefreshProjectsAfterOpen" />
-<!--     background = 5 seconds delayed  -->
-<!--    <postStartupActivity-->
-<!--        implementation="org.move.cli.openProject.CreateDefaultCompileRunConfiguration" />-->
+    <!--     background = 5 seconds delayed  -->
+    <!--    <postStartupActivity-->
+    <!--        implementation="org.move.cli.openProject.CreateDefaultCompileRunConfiguration" />-->
 
 
     <projectConfigurable instance="org.move.cli.settings.PerProjectAptosConfigurable"
@@ -343,7 +341,7 @@
 
     <!-- Notifications -->
     <notificationGroup id="Move Language" displayType="BALLOON" />
-    <notificationGroup id="Move Compile Log" displayType="NONE"/>
+    <notificationGroup id="Move Compile Log" displayType="NONE" />
     <editorNotificationProvider
         implementation="org.move.ide.notifications.InvalidBlockchainCliConfiguration" />
     <editorNotificationProvider
@@ -390,19 +388,19 @@
     <registryKey key="org.move.debug.enabled"
                  defaultValue="false"
                  restartRequired="false"
-                 description="Enable debug mode for Move"/>
+                 description="Enable debug mode for Move" />
     <registryKey key="org.move.external.linter.max.duration"
                  defaultValue="3000"
                  restartRequired="false"
-                 description="Show notification warning if the external linter is running longer than the set value (ms)"/>
+                 description="Show notification warning if the external linter is running longer than the set value (ms)" />
     <registryKey key="org.move.aptos.bundled.force.supported"
                  defaultValue="false"
                  restartRequired="false"
-                 description="Force-enable support for pre-compiled bundled Aptos CLI (imitate non-MacOS)"/>
+                 description="Force-enable support for pre-compiled bundled Aptos CLI (imitate non-MacOS)" />
     <registryKey key="org.move.aptos.bundled.force.unsupported"
                  defaultValue="false"
                  restartRequired="false"
-                 description="Force-disable support for pre-compiled bundled Aptos CLI (imitate MacOS)"/>
+                 description="Force-disable support for pre-compiled bundled Aptos CLI (imitate MacOS)" />
 
     <advancedSetting
         id="org.move.aptos.test.tool.window"
@@ -419,7 +417,7 @@
               topic="org.move.cli.settings.MvProjectSettingsServiceBase$MoveSettingsListener"
               activeInTestMode="false" />
     <listener class="org.move.cli.externalLinter.RsExternalLinterWidgetUpdater"
-              topic="org.move.cli.MoveProjectsService$MoveProjectsListener"/>
+              topic="org.move.cli.MoveProjectsService$MoveProjectsListener" />
   </projectListeners>
 
   <actions>
@@ -460,14 +458,14 @@
 
     <group id="Move.Aptos">
       <reference id="Move.RefreshAllProjects" />
-      <separator/>
-      <reference id="Move.RunExternalLinter"/>
-      <separator/>
-      <reference id="ExpandAll"/>
-      <reference id="CollapseAll"/>
-      <separator/>
+      <separator />
+      <reference id="Move.RunExternalLinter" />
+      <separator />
+      <reference id="ExpandAll" />
+      <reference id="CollapseAll" />
+      <separator />
       <reference id="Move.FetchAptosPackage" />
-      <separator/>
+      <separator />
       <reference id="Move.ShowSettings" />
     </group>
   </actions>
diff --git a/src/main/resources/icons/move_logo.svg b/src/main/resources/icons/move_logo.svg
index 5ea4d1abd..baed098a5 100644
--- a/src/main/resources/icons/move_logo.svg
+++ b/src/main/resources/icons/move_logo.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 259 166" style="enable-background:new 0 0 259 166;" xml:space="preserve">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+     viewBox="0 0 259 166" style="enable-background:new 0 0 259 166;" xml:space="preserve">
 <style type="text/css">
 	.st0{fill:#092342;}
 	.st1{fill:url(#SVGID_1_);}
diff --git a/src/test/kotlin/org/move/ide/annotator/HighlightingAnnotatorTest.kt b/src/test/kotlin/org/move/ide/annotator/HighlightingAnnotatorTest.kt
index 378da39d8..6f96e24e0 100644
--- a/src/test/kotlin/org/move/ide/annotator/HighlightingAnnotatorTest.kt
+++ b/src/test/kotlin/org/move/ide/annotator/HighlightingAnnotatorTest.kt
@@ -174,17 +174,20 @@ class HighlightingAnnotatorTest: AnnotatorTestCase(HighlightingAnnotator::class)
     """
     )
 
-    fun `test imported Self as keyword`() = checkHighlighting(
+    fun `test Self as keyword`() = checkHighlighting(
         """
-    module M {
-        use 0x1::Transaction::<KEYWORD>Self</KEYWORD>
+    module 0x1::m {
+        use 0x1::Transaction::<KEYWORD>Self</KEYWORD>;
+        fun main() {
+            <KEYWORD>Self</KEYWORD>::call();
+        }
     }
         """
     )
 
     fun `test copy is keyword`() = checkHighlighting(
         """
-    module M {
+    module 0x1::m {
         struct S has copy {}
         fun main() {
             let a = <KEYWORD>copy</KEYWORD> 1;
@@ -324,10 +327,10 @@ class HighlightingAnnotatorTest: AnnotatorTestCase(HighlightingAnnotator::class)
         """
         module 0x1::m {
             struct S { field: u8 }
-            fun <METHOD>receiver</METHOD>(<SELF_PARAMETER>self</SELF_PARAMETER>: S, <VARIABLE>self</VARIABLE>: u8): u8 { 
+            fun <METHOD>receiver</METHOD>(<SELF_PARAMETER>self</SELF_PARAMETER>: S): u8 { 
                 <SELF_PARAMETER>self</SELF_PARAMETER>.field 
             }
-            fun main(s: S) {
+            fun main(s: S, <VARIABLE>self</VARIABLE>: u8) {
                 s.<METHOD_CALL>receiver</METHOD_CALL>();
             }
         }        
@@ -338,10 +341,10 @@ class HighlightingAnnotatorTest: AnnotatorTestCase(HighlightingAnnotator::class)
         """
         module 0x1::m {
             struct S { field: u8 }
-            fun <FUNCTION>receiver</FUNCTION>(<VARIABLE>self</VARIABLE>: S, <VARIABLE>self</VARIABLE>: u8): u8 { 
+            fun <FUNCTION>receiver</FUNCTION>(<VARIABLE>self</VARIABLE>: S): u8 { 
                 <VARIABLE>self</VARIABLE>.field 
             }
-            fun main(s: S) {
+            fun main(s: S, <VARIABLE>self</VARIABLE>: u8) {
                 s.<METHOD_CALL>receiver</METHOD_CALL>();
             }
         }        
diff --git a/src/test/kotlin/org/move/ide/docs/MoveNamedAddressDocumentationTest.kt b/src/test/kotlin/org/move/ide/docs/MoveNamedAddressDocumentationTest.kt
index 3edb5a727..b561dd80e 100644
--- a/src/test/kotlin/org/move/ide/docs/MoveNamedAddressDocumentationTest.kt
+++ b/src/test/kotlin/org/move/ide/docs/MoveNamedAddressDocumentationTest.kt
@@ -2,7 +2,7 @@ package org.move.ide.docs
 
 import org.move.utils.tests.MvDocumentationProviderProjectTestCase
 
-class MvNamedAddressDocumentationTest : MvDocumentationProviderProjectTestCase() {
+class MvNamedModulePathDocumentationTest : MvDocumentationProviderProjectTestCase() {
     fun `test value of named address accessible from documentation`() = doTestByFileTree(
         {
             moveToml(
diff --git a/src/test/kotlin/org/move/ide/inspections/AddressByValueImportInspectionTest.kt b/src/test/kotlin/org/move/ide/inspections/AddressByValueImportInspectionTest.kt
deleted file mode 100644
index 602b7649d..000000000
--- a/src/test/kotlin/org/move/ide/inspections/AddressByValueImportInspectionTest.kt
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.move.ide.inspections
-
-import org.move.utils.tests.annotation.InspectionProjectTestBase
-
-class AddressByValueImportInspectionTest : InspectionProjectTestBase(AddressByValueImportInspection::class) {
-    fun `test no inspection if imported from the correct address name`() =
-        checkWeakWarningsByFileTree {
-            moveToml(
-                """
-        [package]
-        name = "MyPackage"
-        [addresses]
-        std = "0x1"
-        aptos_std = "0x1"
-        """
-            )
-            sources {
-                main(
-                    """
-                module aptos_std::main {
-                    use std::debug/*caret*/;
-                    fun main() {
-                        debug::print();
-                    }
-                }    
-                """
-                )
-                move(
-                    "debug.move", """
-            module std::debug { 
-                public native fun print();
-            }    
-            """
-                )
-            }
-        }
-
-    fun `test no inspection if std value is _ in the dependency`() =
-        checkWeakWarningsByFileTree {
-            dir("stdlib") {
-                moveToml(
-                    """
-        [package]
-        name = "Stdlib"
-        [addresses]
-        std = "_"
-        [dev-addresses]
-        std = "0x1"
-        """
-                )
-                sources {
-                    move(
-                        "debug.move", """
-            module std::debug { 
-                public native fun print();
-            }    
-            """
-                    )
-                }
-            }
-            moveToml(
-                """
-        [package]
-        name = "MyPackage"
-        
-        [addresses]
-        std = "0x1"
-
-        [dependencies]
-        Stdlib = { local = "./stdlib" } 
-        """
-            )
-            sources {
-                main(
-                    """
-                module std::main {
-                    use std::debug/*caret*/;
-                    fun main() {
-                        debug::print();
-                    }
-                }    
-                """
-                )
-            }
-        }
-
-    fun `test no inspection if imported from the different address name with different value`() =
-        checkWeakWarningsByFileTree {
-            moveToml(
-                """
-        [package]
-        name = "MyPackage"
-        [addresses]
-        std = "0x1"
-        aptos_std = "0x1"
-        std2 = "0x2"
-        """
-            )
-            sources {
-                main(
-                    """
-                module aptos_std::main {
-                    use std2::debug/*caret*/;
-                    fun main() {
-                        debug::print();
-                    }
-                }    
-                """
-                )
-                move(
-                    "debug.move", """
-            module std::debug { 
-                public native fun print();
-            }    
-            """
-                )
-            }
-        }
-
-    fun `test fail if imported from the different address name but same value`() = checkFixByFileTree(
-        "Change address to `std`",
-        {
-            moveToml(
-                """
-        [package]
-        name = "MyPackage"
-        [addresses]
-        std = "0x1"
-        aptos_std = "0x1"
-        """
-            )
-            sources {
-                main(
-                    """
-                module aptos_std::main {
-                    use <weak_warning descr="Module is declared with a different address `std`">aptos_std::debug/*caret*/</weak_warning>;
-                    fun main() {
-                        debug::print();
-                    }
-                }    
-                """
-                )
-                move(
-                    "debug.move", """
-            module std::debug { 
-                public native fun print();
-            }    
-            """
-                )
-            }
-        }, """
-                module aptos_std::main {
-                    use std::debug;
-                    fun main() {
-                        debug::print();
-                    }
-                }    
-        """, checkWeakWarn = true
-    )
-}
diff --git a/src/test/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspectionTest.kt b/src/test/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspectionTest.kt
index 45bb1f498..2ae9d8ff6 100644
--- a/src/test/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspectionTest.kt
+++ b/src/test/kotlin/org/move/ide/inspections/MvUnresolvedReferenceInspectionTest.kt
@@ -133,11 +133,11 @@ class MvUnresolvedReferenceInspectionTest : InspectionTestBase(MvUnresolvedRefer
     """
     )
 
-    fun `test no unresolved reference for fully qualified module`() = checkByText(
+    fun `test unresolved reference for fully qualified module`() = checkByText(
         """
         module 0x1::M {
             fun main() {
-                0x1::Debug::print(1);
+                0x1::<error descr="Unresolved reference: `Debug`">Debug</error>::print(1);
             }
         }
     """
diff --git a/src/test/kotlin/org/move/ide/inspections/MvUnusedImportInspectionTest.kt b/src/test/kotlin/org/move/ide/inspections/MvUnusedImportInspectionTest.kt
index 3da95a71e..67dc2298f 100644
--- a/src/test/kotlin/org/move/ide/inspections/MvUnusedImportInspectionTest.kt
+++ b/src/test/kotlin/org/move/ide/inspections/MvUnusedImportInspectionTest.kt
@@ -184,13 +184,13 @@ module 0x1::M2 {
     }
     """)
 
-    fun `test skip analyzing for incomplete self item alias`() = checkWarnings("""
+    fun `test incomplete alias considered absent for module`() = checkWarnings("""
     module 0x1::coin {
         struct Coin {}
         public fun get_coin(): Coin {}
     }    
     module 0x1::Main {
-        use 0x1::coin::{Self as<error descr="IDENTIFIER expected, got ','">,</error> Self, Coin};
+        use 0x1::coin::{Self as<error descr="IDENTIFIER expected, got ','">,</error> <warning descr="Unused use item">Self</warning>, Coin};
         
         fun call(): Coin {
             coin::get_coin();
@@ -198,13 +198,13 @@ module 0x1::M2 {
     }
     """)
 
-    fun `test skip analyzing for incomplete item alias`() = checkWarnings("""
+    fun `test incomplete alias considered absent for item`() = checkWarnings("""
     module 0x1::coin {
         struct Coin {}
         public fun get_coin(): Coin {}
     }    
     module 0x1::Main {
-        use 0x1::coin::{Coin as<error descr="IDENTIFIER expected, got ','">,</error> Coin};
+        use 0x1::coin::{Coin as<error descr="IDENTIFIER expected, got ','">,</error> <warning descr="Unused use item">Coin</warning>};
         
         fun call(): Coin {
         }
diff --git a/src/test/kotlin/org/move/ide/inspections/RedundantQualifiedPathInspectionTest.kt b/src/test/kotlin/org/move/ide/inspections/RedundantQualifiedPathInspectionTest.kt
deleted file mode 100644
index 18094e6a2..000000000
--- a/src/test/kotlin/org/move/ide/inspections/RedundantQualifiedPathInspectionTest.kt
+++ /dev/null
@@ -1,240 +0,0 @@
-package org.move.ide.inspections
-
-import org.move.utils.tests.annotation.InspectionTestBase
-
-class RedundantQualifiedPathInspectionTest : InspectionTestBase(RedundantQualifiedPathInspection::class) {
-    fun `test no error if fully qualified without imports`() = checkWarnings(
-        """
-    module 0x1::M {
-        public fun call() {}        
-    }    
-    module 0x1::M2 {
-        fun m() {
-            0x1::M::call();
-        }
-    }    
-    """
-    )
-
-    fun `test no error if qualified with module import`() = checkWarnings(
-        """
-    module 0x1::M {
-        public fun call() {}        
-    }    
-    module 0x1::M2 {
-        use 0x1::M;
-        fun m() {
-            M2::call();
-        }
-    }    
-    """
-    )
-
-    fun `test no error if local name or import`() = checkWarnings(
-        """
-    module 0x1::M {
-        public fun call() {}        
-    }    
-    module 0x1::M2 {
-        use 0x1::M::call;
-        fun local_call() {}
-        fun m() {
-            call();
-            local_call();
-        }
-    }    
-    """
-    )
-
-    fun `test error if fully qualified path and module imported`() = checkFixByText(
-        "Remove redundant qualifier", """
-    module 0x1::M {
-        public fun call() {}        
-    }    
-    module 0x1::M2 {
-        use 0x1::M;
-        fun m() {
-            <warning descr="Redundant qualifier">0x1/*caret*/::</warning>M::call();
-        }
-    }    
-    """, """
-    module 0x1::M {
-        public fun call() {}        
-    }    
-    module 0x1::M2 {
-        use 0x1::M;
-        fun m() {
-            /*caret*/M::call();
-        }
-    }    
-    """
-    )
-
-    fun `test error if fully qualified path and method imported`() = checkFixByText(
-        "Remove redundant qualifier", """
-    module 0x1::M {
-        public fun call() {}
-    }    
-    module 0x1::M2 {
-        use 0x1::M::call;
-        fun m() {
-            <warning descr="Redundant qualifier">0x1::M/*caret*/::</warning>call();
-        }
-    }    
-    """, """
-    module 0x1::M {
-        public fun call() {}
-    }    
-    module 0x1::M2 {
-        use 0x1::M::call;
-        fun m() {
-            /*caret*/call();
-        }
-    }    
-    """
-    )
-
-    fun `test error if qualified path and method imported`() = checkFixByText(
-        "Remove redundant qualifier", """
-    module 0x1::M {
-        public fun call() {}
-    }    
-    module 0x1::M2 {
-        use 0x1::M;
-        use 0x1::M::call;
-        fun m() {
-            <warning descr="Redundant qualifier">M/*caret*/::</warning>call();
-        }
-    }    
-    """, """
-    module 0x1::M {
-        public fun call() {}
-    }    
-    module 0x1::M2 {
-        use 0x1::M;
-        use 0x1::M::call;
-        fun m() {
-            /*caret*/call();
-        }
-    }    
-    """
-    )
-
-    fun `test no error if qualified path and method imported with alias`() = checkWarnings("""
-    module 0x1::M {
-        public fun call() {}
-    }    
-    module 0x1::M2 {
-        use 0x1::M;
-        use 0x1::M::call as mycall_mycall_mycall;
-        fun m() {
-            mycall_mycall_mycall();
-        }
-    }    
-    """
-    )
-
-    fun `test error method imported is higher priority`() = checkFixByText(
-        "Remove redundant qualifier", """
-    module 0x1::M {
-        public fun call() {}
-    }        
-    module 0x1::M2 {
-        use 0x1::M;
-        use 0x1::M::call;
-        fun m() {
-            <warning descr="Redundant qualifier">0x1::M/*caret*/::</warning>call();
-        }
-    }    
-    """, """
-    module 0x1::M {
-        public fun call() {}
-    }        
-    module 0x1::M2 {
-        use 0x1::M;
-        use 0x1::M::call;
-        fun m() {
-            /*caret*/call();
-        }
-    }    
-    """
-    )
-
-    fun `test no redundant qual with Self path`() = checkWarnings("""
-    module 0x1::M {
-        struct S {}
-        fun call() {}
-        fun m(a: Self::S) acquires Self::S {
-            Self::call();
-        }
-    }    
-    """)
-
-    fun `test no redundant qualifier for struct with generic`() = checkWarnings("""
-    module 0x1::Coin {
-        struct MintCapability<CoinType> has store {}
-    }    
-    module 0x1::M {
-        use 0x1::Coin::MintCapability;
-        
-        struct BTC {}
-        struct Caps has key {
-            cap2: MintCapability<BTC>,
-        }       
-    }
-    """)
-
-    fun `test no redundant qualifier for line break`() = checkWarnings("""
-    module 0x1::coin {
-        public fun get_collateral_counts_test(): (u64, u64) { (1, 1) }
-    }    
-    module 0x1::M {
-        use 0x1::coin;
-        fun call() {
-            coin::
-            get_collateral_counts_test();
-        }        
-    }        
-    """)
-
-//    fun `test remove redundant qualifier with specified generic`() = checkFixByText(
-//        "Remove redundant qualifier", """
-//    module 0x1::M {
-//        public fun call<Curve>() {}
-//    }
-//    module 0x1::M2 {
-//        use 0x1::M;
-//        use 0x1::M::call;
-//        fun m() {
-//            <warning descr="Redundant qualifier">0x1::M/*caret*/::</warning>call<u8>();
-//        }
-//    }
-//    """, """
-//    module 0x1::M {
-//        public fun call<Curve>() {}
-//    }
-//    module 0x1::M2 {
-//        use 0x1::M;
-//        use 0x1::M::call;
-//        fun m() {
-//            /*caret*/call<u8>();
-//        }
-//    }
-//    """
-//    )
-
-//    fun `test no redundant qualifier if import is in a different scope`() = checkByText("""
-//module 0x1::string {
-//    public fun call() {}
-//}
-//module 0x1::main {
-//    #[test_only]
-//    use 0x1::string;
-//
-//    fun main() {
-//        0x1::string::call();
-//    }
-//}
-//    """)
-
-}
diff --git a/src/test/kotlin/org/move/ide/inspections/imports/AutoImportFixTest.kt b/src/test/kotlin/org/move/ide/inspections/imports/AutoImportFixTest.kt
index 3e61ac713..3eb771aff 100644
--- a/src/test/kotlin/org/move/ide/inspections/imports/AutoImportFixTest.kt
+++ b/src/test/kotlin/org/move/ide/inspections/imports/AutoImportFixTest.kt
@@ -388,7 +388,7 @@ module 0x1::main {
 }        
     """)
 
-    fun `test cannot auto import test function from same file`() = checkAutoImportFixIsUnavailable("""
+    fun `test cannot auto import test function from the same file`() = checkAutoImportFixIsUnavailable("""
 module 0x1::m1 {
     #[test]
     public fun test_a() {}
diff --git a/src/test/kotlin/org/move/ide/inspections/imports/ImportCandidatesTest.kt b/src/test/kotlin/org/move/ide/inspections/imports/ImportCandidatesTest.kt
index 4872f7341..d3ee311a9 100644
--- a/src/test/kotlin/org/move/ide/inspections/imports/ImportCandidatesTest.kt
+++ b/src/test/kotlin/org/move/ide/inspections/imports/ImportCandidatesTest.kt
@@ -1,6 +1,7 @@
 package org.move.ide.inspections.imports
 
 import org.move.ide.utils.imports.ImportCandidateCollector
+import org.move.lang.core.psi.MvPath
 import org.move.lang.core.resolve.ref.MvReferenceElement
 import org.move.utils.tests.FileTreeBuilder
 import org.move.utils.tests.MvProjectTestBase
@@ -221,11 +222,12 @@ module 0x1::main {
         val refClass = MvReferenceElement::class.java
         val (refElement, data, _) =
             myFixture.findElementWithDataAndOffsetInEditor(refClass, "^")
-        val targetName = refElement.referenceName ?: error("No name for reference element")
+        val path = refElement as? MvPath ?: error("no path at caret")
+        val targetName = path.referenceName ?: error("No name for reference element")
 
         val candidates =
             ImportCandidateCollector
-                .getImportCandidates(ImportContext.Companion.from(refElement), targetName)
+                .getImportCandidates(ImportContext.Companion.from(path), targetName)
                 .map { it.qualName.editorText() }
         if (data == "[]") {
             check(candidates.isEmpty()) { "Non-empty candidates: $candidates" }
diff --git a/src/test/kotlin/org/move/ide/refactoring/optimizeImports/OptimizeImportsTest.kt b/src/test/kotlin/org/move/ide/refactoring/optimizeImports/OptimizeImportsTest.kt
index 65652b370..4a6f9fc81 100644
--- a/src/test/kotlin/org/move/ide/refactoring/optimizeImports/OptimizeImportsTest.kt
+++ b/src/test/kotlin/org/move/ide/refactoring/optimizeImports/OptimizeImportsTest.kt
@@ -180,13 +180,13 @@ class OptimizeImportsTest : OptimizeImportsTestBase() {
             use BBB::M2::S2;
             use AAA::M1::S1;
             use AAA::M1::SS1;
-            use Std::Signer;
-            use std::signature;
             use aptos_std::table;
             use aptos_std::iter_table;
             use aptos_framework::coin;
             #[test_only]
             use Std::Errors;
+            use Std::Signer;
+            use std::signature;
         
             fun call(a: S1, b: S2, c: SS1) {
                 Signer::address_of();
diff --git a/src/test/kotlin/org/move/ide/search/FindUsagesNamedAddressTest.kt b/src/test/kotlin/org/move/ide/search/FindUsagesNamedModulePathTest.kt
similarity index 97%
rename from src/test/kotlin/org/move/ide/search/FindUsagesNamedAddressTest.kt
rename to src/test/kotlin/org/move/ide/search/FindUsagesNamedModulePathTest.kt
index 5be8e27f6..787b30c41 100644
--- a/src/test/kotlin/org/move/ide/search/FindUsagesNamedAddressTest.kt
+++ b/src/test/kotlin/org/move/ide/search/FindUsagesNamedModulePathTest.kt
@@ -8,7 +8,7 @@ import org.move.utils.tests.MvProjectTestBase
 import org.move.utils.tests.base.findElementWithDataAndOffsetInEditor
 import org.toml.lang.psi.TomlKeySegment
 
-class FindUsagesNamedAddressTest : MvProjectTestBase() {
+class FindUsagesNamedModulePathTest : MvProjectTestBase() {
     fun `test resolve toml to move usage`() = doTestByText(
         """
         //- Move.toml
diff --git a/src/test/kotlin/org/move/ide/search/FindUsagesTest.kt b/src/test/kotlin/org/move/ide/search/FindUsagesTest.kt
index 29e86ee93..51ad53198 100644
--- a/src/test/kotlin/org/move/ide/search/FindUsagesTest.kt
+++ b/src/test/kotlin/org/move/ide/search/FindUsagesTest.kt
@@ -40,6 +40,14 @@ class FindUsagesTest : MvTestBase() {
         }
     }    
     """)
+//
+//    fun `test module`() = doTestByText("""
+//    module 0x1::m {}
+//              //^
+//    module 0x1::main {
+//        use 0x1::m;  // - module
+//    }
+//    """)
 
     private fun doTestByText(@Language("Move") code: String) {
         InlineFile(code)
diff --git a/src/test/kotlin/org/move/lang/NamedAddressValuesTest.kt b/src/test/kotlin/org/move/lang/NamedModulePathValuesTest.kt
similarity index 83%
rename from src/test/kotlin/org/move/lang/NamedAddressValuesTest.kt
rename to src/test/kotlin/org/move/lang/NamedModulePathValuesTest.kt
index 64a3c25b5..0ef81edf7 100644
--- a/src/test/kotlin/org/move/lang/NamedAddressValuesTest.kt
+++ b/src/test/kotlin/org/move/lang/NamedModulePathValuesTest.kt
@@ -6,49 +6,63 @@ import org.move.utils.tests.FileTreeBuilder
 import org.move.utils.tests.MvProjectTestBase
 import org.move.utils.tests.base.findElementAndDataInEditor
 
-class NamedAddressValuesTest : MvProjectTestBase() {
+class NamedModulePathValuesTest: MvProjectTestBase() {
     fun `test named address`() = checkByFileTree {
-        moveToml("""
+        moveToml(
+            """
         [addresses]
         Std = "0x1"
-        """)
+        """
+        )
         sources {
-            move("main.move", """
+            move(
+                "main.move", """
             module Std::Module {}
                    //^ Std = 0x1
-            """)
+            """
+            )
         }
     }
 
     fun `test placeholder address`() = checkByFileTree {
-        moveToml("""
+        moveToml(
+            """
         [addresses]
         Std = "_"
-        """)
+        """
+        )
         sources {
-            move("main.move", """
+            move(
+                "main.move", """
             module Std::Module {}
                    //^ Std = _
-            """)
+            """
+            )
         }
     }
 
     fun `test dependency address`() = checkByFileTree {
-        moveToml("""
+        moveToml(
+            """
         [dependencies]
         Stdlib = { local = "./stdlib" }
-        """)
+        """
+        )
         dir("stdlib") {
-            moveToml("""
+            moveToml(
+                """
             [addresses]
             Std = "0x1"
-            """)
+            """
+            )
         }
         sources {
-            move("main.move", """
+            move(
+                "main.move", """
             module Std::Module {}
                    //^ Std = 0x1
-            """)
+            """
+            )
         }
     }
 
@@ -129,9 +143,8 @@ class NamedAddressValuesTest : MvProjectTestBase() {
         sources {
             move(
                 "main.move", """
-            module 0x1::M {
-                use Std::Reflect;
-                    //^ Std = 0x2
+            module Std::M {
+                  //^ Std = 0x2
             }
             """
             )
@@ -157,27 +170,33 @@ class NamedAddressValuesTest : MvProjectTestBase() {
     fun `test named address from git dependency`() = checkByFileTree {
         dotMove {
             git("https://github.com/pontem-network/move-stdlib.git", "main") {
-                moveToml("""
+                moveToml(
+                    """
                 [package]
                 name = "Stdlib"
                 
                 [addresses]
                 Std = "0x2"    
-                """)
+                """
+                )
             }
         }
-        moveToml("""
+        moveToml(
+            """
     [package]
     name = "Module"
             
     [dependencies]
     Stdlib = { git = "https://github.com/pontem-network/move-stdlib.git", rev = "main"}          
-        """)
+        """
+        )
         sources {
-            move("main.move", """
+            move(
+                "main.move", """
             module Std::Module {}
                   //^ Std = 0x2
-            """)
+            """
+            )
         }
     }
 
diff --git a/src/test/kotlin/org/move/lang/completion/KeywordCompletionTest.kt b/src/test/kotlin/org/move/lang/completion/KeywordCompletionTest.kt
index 8674b8084..bb790b702 100644
--- a/src/test/kotlin/org/move/lang/completion/KeywordCompletionTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/KeywordCompletionTest.kt
@@ -1,6 +1,7 @@
 package org.move.lang.completion
 
-import org.move.ide.inspections.fixes.CompilerV2Feat.*
+import org.move.ide.inspections.fixes.CompilerV2Feat.PUBLIC_PACKAGE
+import org.move.ide.inspections.fixes.CompilerV2Feat.RESOURCE_CONTROL
 import org.move.utils.tests.CompilerV2Features
 import org.move.utils.tests.completion.CompletionTestCase
 
diff --git a/src/test/kotlin/org/move/lang/completion/lookups/BuiltInFunctionLookupTest.kt b/src/test/kotlin/org/move/lang/completion/lookups/BuiltInFunctionLookupTest.kt
index b13fc4ab1..0cc3dbfd7 100644
--- a/src/test/kotlin/org/move/lang/completion/lookups/BuiltInFunctionLookupTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/lookups/BuiltInFunctionLookupTest.kt
@@ -6,7 +6,6 @@ import org.move.lang.core.completion.CompletionContext
 import org.move.lang.core.completion.createLookupElement
 import org.move.lang.core.psi.MvModule
 import org.move.lang.core.psi.ext.builtinFunctions
-import org.move.lang.core.resolve.ContextScopeInfo
 import org.move.utils.tests.MvTestBase
 import org.move.utils.tests.base.findElementInEditor
 
@@ -44,7 +43,8 @@ class BuiltInFunctionLookupTest: MvTestBase() {
         val moduleElement = myFixture.findElementInEditor<MvModule>()
         val lookup =
             moduleElement.builtinFunctions().single { it.name == name }.let {
-                it.createLookupElement(CompletionContext(it, ContextScopeInfo.default()))
+                it.createLookupElement(CompletionContext(it, false))
+//                it.createLookupElement(CompletionContext(it, ContextScopeInfo.default()))
             }
         checkLookupPresentation(
             lookup,
diff --git a/src/test/kotlin/org/move/lang/completion/lookups/LookupElementTest.kt b/src/test/kotlin/org/move/lang/completion/lookups/LookupElementTest.kt
index 0189e0077..fb3dc5059 100644
--- a/src/test/kotlin/org/move/lang/completion/lookups/LookupElementTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/lookups/LookupElementTest.kt
@@ -15,7 +15,6 @@ import org.move.lang.core.completion.providers.MethodOrFieldCompletionProvider
 import org.move.lang.core.psi.MvElement
 import org.move.lang.core.psi.MvNamedElement
 import org.move.lang.core.psi.ext.MvMethodOrField
-import org.move.lang.core.resolve.ContextScopeInfo
 import org.move.lang.core.resolve.ref.MvReferenceElement
 import org.move.utils.tests.CompilerV2Features
 import org.move.utils.tests.MvTestBase
@@ -157,26 +156,26 @@ class LookupElementTest: MvTestBase() {
         }        
     """, tailText = "(&mut self)", typeText = "u8"
     )
+//
+//    fun `test import module lookup`() = checkNamedItem("""
+//        module 0x1::m {
+//            public fun identity(a: u8): u8 { a }
+//        }
+//        module 0x1::main {
+//            use 0x1::m;
+//                   //^
+//        }
+//    """, tailText = " 0x1", typeText = "main.move")
 
-    fun `test import module lookup`() = checkNamedItem("""
-        module 0x1::m {
-            public fun identity(a: u8): u8 { a }
-        }        
-        module 0x1::main {
-            use 0x1::m;
-                   //^
-        }
-    """, tailText = " 0x1", typeText = "main.move")
-
-    fun `test import function lookup`() = checkNamedItem("""
-        module 0x1::m {
-            public fun identity(a: u8): u8 { a }
-        }        
-        module 0x1::main {
-            use 0x1::m::identity;
-                        //^
-        }
-    """, tailText = "(a: u8): u8", typeText = "main.move")
+//    fun `test import function lookup`() = checkNamedItem("""
+//        module 0x1::m {
+//            public fun identity(a: u8): u8 { a }
+//        }
+//        module 0x1::main {
+//            use 0x1::m::identity;
+//                        //^
+//        }
+//    """, tailText = "(a: u8): u8", typeText = "main.move")
 
     private fun checkNamedItem(
         @Language("Move") code: String,
@@ -198,7 +197,8 @@ class LookupElementTest: MvTestBase() {
         val element = myFixture.findElementInEditor<T>() as? MvNamedElement
             ?: error("Marker `^` should point to the MvNamedElement")
 
-        val completionCtx = CompletionContext(element, ContextScopeInfo.default())
+        val completionCtx = CompletionContext(element, false)
+//        val completionCtx = CompletionContext(element, ContextScopeInfo.default())
         val lookup = element.createLookupElement(completionCtx)
         checkLookupPresentation(
             lookup,
diff --git a/src/test/kotlin/org/move/lang/completion/names/FunctionsCompletionTest.kt b/src/test/kotlin/org/move/lang/completion/names/FunctionsCompletionTest.kt
index 67c0638e2..b5b4dfb85 100644
--- a/src/test/kotlin/org/move/lang/completion/names/FunctionsCompletionTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/names/FunctionsCompletionTest.kt
@@ -123,14 +123,11 @@ class FunctionsCompletionTest : CompletionTestCase() {
 
     fun `test public and public(friend) completions for module`() = completionFixture.checkContainsCompletion(
         """
-        address 0x1 {
-        module Transaction {
+        module 0x1::Transaction {
             friend 0x1::M;
             public(friend) fun create_friend() {}
             public fun create() {}
         }
-        }
-        
         module 0x1::M {
             fun main() {
                 0x1::Transaction::cr/*caret*/
diff --git a/src/test/kotlin/org/move/lang/completion/names/ModulesCompletionTest.kt b/src/test/kotlin/org/move/lang/completion/names/ModulesCompletionTest.kt
index a90a849b0..a7e0736b3 100644
--- a/src/test/kotlin/org/move/lang/completion/names/ModulesCompletionTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/names/ModulesCompletionTest.kt
@@ -2,9 +2,10 @@ package org.move.lang.completion.names
 
 import org.move.utils.tests.completion.CompletionTestCase
 
-class ModulesCompletionTest : CompletionTestCase() {
+class ModulesCompletionTest: CompletionTestCase() {
     fun `test autocomplete imported modules in name position`() = doSingleCompletion(
         """
+        module 0x1::Transaction {}
         script {
             use 0x1::Transaction;
             
@@ -13,6 +14,7 @@ class ModulesCompletionTest : CompletionTestCase() {
             }
         }    
     """, """
+        module 0x1::Transaction {}
         script {
             use 0x1::Transaction;
             
@@ -25,12 +27,14 @@ class ModulesCompletionTest : CompletionTestCase() {
 
     fun `test autocomplete imported modules in type position`() = doSingleCompletion(
         """
+        module 0x1::Transaction {}
         script {
             use 0x1::Transaction;
             
             fun main(a: Tra/*caret*/) {}
         }    
     """, """
+        module 0x1::Transaction {}
         script {
             use 0x1::Transaction;
             
@@ -39,19 +43,72 @@ class ModulesCompletionTest : CompletionTestCase() {
     """
     )
 
-    fun `test autocomplete available modules for address`() = checkContainsCompletion(
-        "Transaction", """
-        address 0x1 {
-            module Transaction {}
+    fun `test autocomplete available modules for address`() = doSingleCompletion(
+        """
+        module 0x1::Transaction {}            
+        script {
+            use 0x1::Tra/*caret*/;
+        }
+        """, """
+        module 0x1::Transaction {}            
+        script {
+            use 0x1::Transaction/*caret*/;
+        }
+        """
+    )
+
+    fun `test single completion for two modules with the same name`() = doSingleCompletion(
+        """
+        module 0x1::Transaction {}
+        module 0x2::Transaction {}
+        
+        script {
+            use 0x1::Tra/*caret*/
         }
+        """, """
+        module 0x1::Transaction {}
+        module 0x2::Transaction {}
         
         script {
-            use 0x01::/*caret*/
+            use 0x1::Transaction/*caret*/
         }
         """
     )
 
-    fun `test complete Self item`() = doSingleCompletion("""
+    fun `test no functions in module completion in use speck`() = checkNoCompletion(
+        """
+        module 0x1::transaction {
+            public fun transpose() {}
+        }
+        
+        script {
+            use 0x1::transp/*caret*/;
+        }
+        """
+    )
+
+    fun `test no auto import for functions at item completion in use speck`() = doSingleCompletion(
+        """
+        module 0x1::transaction {
+            public fun transpose() {}
+        }
+        
+        script {
+            use 0x1::transaction::transp/*caret*/;
+        }
+        """, """
+        module 0x1::transaction {
+            public fun transpose() {}
+        }
+        
+        script {
+            use 0x1::transaction::transpose/*caret*/;
+        }
+        """
+    )
+
+    fun `test complete Self item`() = doSingleCompletion(
+        """
     module 0x1::Signer {} 
     module 0x1::M {
         use 0x1::Signer::{Se/*caret*/};
@@ -61,23 +118,40 @@ class ModulesCompletionTest : CompletionTestCase() {
     module 0x1::M {
         use 0x1::Signer::{Self/*caret*/};
     }    
-    """)
+    """
+    )
 
-    fun `test no Self completion if already imported in this block`() = checkNoCompletion("""
+    fun `test no item completion if already imported in use group`() = checkNoCompletion(
+        """
+    module 0x1::Signer {
+        public fun address_of(): address { @0x1 } 
+    } 
+    module 0x1::M {
+        use 0x1::Signer::{address_of, addr/*caret*/};
+    }    
+    """
+    )
+
+    fun `test no Self completion if already imported in this block`() = checkNoCompletion(
+        """
     module 0x1::Signer {} 
     module 0x1::M {
         use 0x1::Signer::{Self, Se/*caret*/};
     }    
-    """)
+    """
+    )
 
-    fun `test no Self completion without block`() = checkNoCompletion("""
+    fun `test no Self completion without block`() = checkNoCompletion(
+        """
     module 0x1::Signer {} 
     module 0x1::M {
         use 0x1::Signer::Se/*caret*/;
     }    
-    """)
+    """
+    )
 
-    fun `test module name in path position with auto import`() = doSingleCompletion("""
+    fun `test module name in path position with auto import`() = doSingleCompletion(
+        """
     module 0x1::Signer {}
     module 0x1::M {
         fun call() {
@@ -95,9 +169,11 @@ class ModulesCompletionTest : CompletionTestCase() {
             Signer/*caret*/
         }
     }    
-    """)
+    """
+    )
 
-    fun `test no import if name already in scope`() = doSingleCompletion("""
+    fun `test no import if name already in scope`() = doSingleCompletion(
+        """
     module 0x1::Signer {}
     module 0x1::M {
         use 0x1::Signer;
@@ -117,17 +193,21 @@ class ModulesCompletionTest : CompletionTestCase() {
             Signer/*caret*/
         }
     }    
-    """)
+    """
+    )
 
-    fun `test module name itself should not be present in completion`() = checkNoCompletion("""
+    fun `test module name itself should not be present in completion`() = checkNoCompletion(
+        """
     module 0x1::Main {
         fun call() {
             Ma/*caret*/
         }
     }    
-    """)
+    """
+    )
 
-    fun `test test_only modules not present in non test_only scopes`() = checkNoCompletion("""
+    fun `test test_only modules not present in non test_only scopes`() = checkNoCompletion(
+        """
     #[test_only]    
     module 0x1::TestHelpers {}
     module 0x1::Main {
@@ -135,9 +215,11 @@ class ModulesCompletionTest : CompletionTestCase() {
             TestH/*caret*/
         }
     }    
-    """)
+    """
+    )
 
-    fun `test import test_only modules in test_only context`() = doSingleCompletion("""
+    fun `test import test_only modules in test_only context`() = doSingleCompletion(
+        """
     #[test_only]    
     module 0x1::Helpers {}
     #[test_only]
@@ -151,13 +233,43 @@ class ModulesCompletionTest : CompletionTestCase() {
     module 0x1::ModuleTests {
         use 0x1::Helpers/*caret*/
     }    
-    """)
+    """
+    )
 
-    fun `test no completion in non test context`() = checkNoCompletion("""
+    fun `test test_only module completion is possible in non test context inside use speck`() = doSingleCompletion(
+        """
     #[test_only]    
     module 0x1::Helpers {}
     module 0x1::Module {
         use 0x1::He/*caret*/
     }    
+    """, """
+    #[test_only]    
+    module 0x1::Helpers {}
+    module 0x1::Module {
+        use 0x1::Helpers/*caret*/
+    }    
+    """
+    )
+
+
+    fun `test no Self completion for fully qualified path`() = checkNoCompletion(
+        """
+        module 0x1::m1 {}
+        module 0x1::m {
+            fun main() {
+                0x1::m1::Se/*caret*/;
+            }
+        }        
+    """
+    )
+
+    fun `test no modules completion for item position`() = checkNoCompletion("""
+        module 0x1::Transaction {
+        }
+        module 0x1::M {
+            fun main(a: 0x1::Transaction::Tra/*caret*/) {
+            }
+        }
     """)
 }
diff --git a/src/test/kotlin/org/move/lang/completion/names/SpecsCompletionTest.kt b/src/test/kotlin/org/move/lang/completion/names/SpecsCompletionTest.kt
index f0a58422c..1bd7d9f2a 100644
--- a/src/test/kotlin/org/move/lang/completion/names/SpecsCompletionTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/names/SpecsCompletionTest.kt
@@ -209,7 +209,7 @@ class SpecsCompletionTest: CompletionTestCase() {
     module 0x1::M {
         fun call() {}
         spec call {
-            include MySchema { ad/*caret*/ }
+            include MySchema { ad/*caret*/ };
         }
         spec schema MySchema {
             addr: address;
@@ -219,7 +219,53 @@ class SpecsCompletionTest: CompletionTestCase() {
     module 0x1::M {
         fun call() {}
         spec call {
-            include MySchema { addr/*caret*/ }
+            include MySchema { addr/*caret*/ };
+        }
+        spec schema MySchema {
+            addr: address;
+        }
+    }
+    """)
+
+    fun `test autocomplete fields in include schema if full field name is provided`() = doSingleCompletion("""
+    module 0x1::M {
+        fun call() {}
+        spec call {
+            include MySchema { addr/*caret*/ };
+        }
+        spec schema MySchema {
+            addr: address;
+        }
+    }
+    """, """
+    module 0x1::M {
+        fun call() {}
+        spec call {
+            include MySchema { addr/*caret*/ };
+        }
+        spec schema MySchema {
+            addr: address;
+        }
+    }
+    """)
+
+    fun `test no completion if field already used`() = checkNoCompletion("""
+    module 0x1::M {
+        fun call() {}
+        spec call {
+            include MySchema { addr, ad/*caret*/ };
+        }
+        spec schema MySchema {
+            addr: address;
+        }
+    }
+    """)
+
+    fun `test no completion if field already used at the end`() = checkNoCompletion("""
+    module 0x1::M {
+        fun call() {}
+        spec call {
+            include MySchema { ad/*caret*/, addr };
         }
         spec schema MySchema {
             addr: address;
diff --git a/src/test/kotlin/org/move/lang/completion/names/StructsCompletionTest.kt b/src/test/kotlin/org/move/lang/completion/names/StructsCompletionTest.kt
index 132019b43..f9923dd76 100644
--- a/src/test/kotlin/org/move/lang/completion/names/StructsCompletionTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/names/StructsCompletionTest.kt
@@ -199,25 +199,21 @@ class StructsCompletionTest: CompletionTestCase() {
     """)
 
     fun `test module struct completion in type position`() = doSingleCompletion("""
-        address 0x1 {
-        module Transaction {
+        module 0x1::Transaction {
             struct Type {
                 val: u8                   
             }
         }
-        }
         module 0x1::M {
-            fun main(a: 0x1::Transaction::/*caret*/) {
+            fun main(a: 0x1::Transaction::T/*caret*/) {
             }
         }
     """, """
-        address 0x1 {
-        module Transaction {
+        module 0x1::Transaction {
             struct Type {
                 val: u8                   
             }
         }
-        }
         module 0x1::M {
             fun main(a: 0x1::Transaction::Type/*caret*/) {
             }
diff --git a/src/test/kotlin/org/move/lang/completion/names/project/ModulesCompletionProjectTest.kt b/src/test/kotlin/org/move/lang/completion/names/project/ModulesCompletionProjectTest.kt
index c3605e428..3d3f39438 100644
--- a/src/test/kotlin/org/move/lang/completion/names/project/ModulesCompletionProjectTest.kt
+++ b/src/test/kotlin/org/move/lang/completion/names/project/ModulesCompletionProjectTest.kt
@@ -2,7 +2,7 @@ package org.move.lang.completion.names.project
 
 import org.move.utils.tests.completion.CompletionProjectTestCase
 
-class ModulesCompletionProjectTest : CompletionProjectTestCase() {
+class ModulesCompletionProjectTest: CompletionProjectTestCase() {
 
     fun `test complete modules from all the files in imports`() =
         checkContainsCompletionsExact(listOf("M1", "M2")) {
@@ -121,7 +121,7 @@ class ModulesCompletionProjectTest : CompletionProjectTestCase() {
         }
     }
 
-    fun `test named address is identified only with name`() = checkNoCompletion {
+    fun `test no named address completion in module position`() = checkNoCompletion {
         moveToml(
             """
         [package]
@@ -129,22 +129,79 @@ class ModulesCompletionProjectTest : CompletionProjectTestCase() {
 
         [addresses]
         Std = "0x1"
-        Pontem = "0x1"
+        Pontem = "0x2"
         """
         )
         sources {
             move(
                 "mod.move", """
             module Std::StdMod {}
-            module Pontem::PontemMod {}
+            module Pontem::MyMod {}
             module 0x1::MyMod {
-                use 0x1::Pont/*caret*/
+                use 0x2::Pont/*caret*/
             }    
             """
             )
         }
     }
 
+    fun `test no named address completion in item position`() = checkNoCompletion {
+        moveToml(
+            """
+        [package]
+        name = "package"
+
+        [addresses]
+        Std = "0x1"
+        Pontem = "0x2"
+        """
+        )
+        sources {
+            move(
+                "mod.move", """
+            module Std::StdMod {}
+            module Pontem::MyMod {}
+            module 0x1::MyMod {
+                use 0x2::MyMod::Pont/*caret*/
+            }    
+            """
+            )
+        }
+    }
+
+    fun `test completion for value address is available if identified with name`() = doSingleCompletion(
+        {
+            moveToml(
+                """
+        [package]
+        name = "package"
+
+        [addresses]
+        Std = "0x1"
+        Pontem = "0x2"
+        """
+            )
+            sources {
+                move(
+                    "mod.move", """
+            module Std::StdMod {}
+            module Pontem::PontemMod {}
+            module 0x1::MyMod {
+                use 0x2::Pont/*caret*/
+            }    
+            """
+                )
+            }
+        },
+        """
+            module Std::StdMod {}
+            module Pontem::PontemMod {}
+            module 0x1::MyMod {
+                use 0x2::PontemMod/*caret*/
+            }    
+        """
+    )
+
     fun `test modules from tests directory should not be in completion of sources`() = checkNoCompletion {
         namedMoveToml("MyPackage")
         sources {
@@ -205,11 +262,13 @@ class ModulesCompletionProjectTest : CompletionProjectTestCase() {
         """
         )
         sources {
-            main("""
+            main(
+                """
             module 0x1::M {
                 use aptos_std::de/*caret*/;
             }    
-            """)
+            """
+            )
             move(
                 "debug.move", """
             module std::debug {
diff --git a/src/test/kotlin/org/move/lang/parser/CompleteParsingTest.kt b/src/test/kotlin/org/move/lang/parser/CompleteParsingTest.kt
index 355f13d63..33366f34c 100644
--- a/src/test/kotlin/org/move/lang/parser/CompleteParsingTest.kt
+++ b/src/test/kotlin/org/move/lang/parser/CompleteParsingTest.kt
@@ -44,6 +44,8 @@ class CompleteParsingTest: MvParsingTestCase("complete") {
     fun `test macros`() = doTest()
     fun `test loops`() = doTest()
 
+    fun `test paths`() = doTest()
+
     // compiler v2
     fun `test index expr`() = doTest()
     fun `test public package`() = doTest()
diff --git a/src/test/kotlin/org/move/lang/parser/PartialParsingTest.kt b/src/test/kotlin/org/move/lang/parser/PartialParsingTest.kt
index fa4b56d50..8ed83461f 100644
--- a/src/test/kotlin/org/move/lang/parser/PartialParsingTest.kt
+++ b/src/test/kotlin/org/move/lang/parser/PartialParsingTest.kt
@@ -6,7 +6,7 @@ class PartialParsingTest: MvParsingTestCase("partial") {
     // top level items recovery
     fun `test top level items`() = doTest(true)
     fun `test module const`() = doTest(true)
-    fun `test module uses`() = doTest(true)
+//    fun `test module uses`() = doTest(true)
 
     fun `test spec`() = doTest(true)
 
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveFunctionTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveFunctionTest.kt
index c45580f16..8a785f560 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveFunctionTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveFunctionTest.kt
@@ -1,11 +1,12 @@
 package org.move.lang.resolve
 
+import org.move.utils.tests.NamedAddress
 import org.move.utils.tests.resolve.ResolveTestCase
 
-class ResolveFunctionTest : ResolveTestCase() {
+class ResolveFunctionTest: ResolveTestCase() {
     fun `test resolve reference to function`() = checkByCode(
         """
-        module M {
+        module 0x1::m {
             fun call(): u8 {
               //X
                 1
@@ -21,7 +22,7 @@ class ResolveFunctionTest : ResolveTestCase() {
 
     fun `test resolve reference to native function`() = checkByCode(
         """
-        module M {
+        module 0x1::m {
             native fun call(): u8;
                      //X
             
@@ -208,8 +209,11 @@ class ResolveFunctionTest : ResolveTestCase() {
 
     fun `test resolve function to import alias`() = checkByCode(
         """
-        module M {
-            use 0x1::Original::call as mycall;
+        module 0x1::original {
+            public fun call() {}
+        }    
+        module 0x1::m {
+            use 0x1::original::call as mycall;
                                      //X
             fun main() {
                 mycall();
@@ -242,7 +246,7 @@ class ResolveFunctionTest : ResolveTestCase() {
 
     fun `test resolve reference to function via Self`() = checkByCode(
         """
-        module M {
+        module 0x1::m {
             fun call(): u8 {
               //X
                 1
@@ -276,6 +280,24 @@ class ResolveFunctionTest : ResolveTestCase() {
     """
     )
 
+    @NamedAddress("aptos_std", "0x1")
+    fun `test resolve friend function with named address`() = checkByCode(
+        """
+        module aptos_std::original {
+            friend aptos_std::m;
+            public(friend) fun call() {}
+                             //X
+        }
+        module aptos_std::m {
+            use aptos_std::original;
+            fun main() {
+                original::call();
+                         //^
+            }
+        }    
+    """
+    )
+
     fun `test script function is unresolved in friend modules`() = checkByCode(
         """
         address 0x1 {
@@ -316,22 +338,18 @@ class ResolveFunctionTest : ResolveTestCase() {
 
     fun `test friend function is unresolved in scripts`() = checkByCode(
         """
-        address 0x1 {
-        module Original {
-            friend 0x1::M;
+        module 0x1::original {
+            friend 0x1::m;
             public(friend) fun call() {}
         }
-        
-        module M {}    
-        }
-        
-        script {
-            use 0x1::Original;
+        module 0x1::m {}
+        script { 
+            use 0x1::original;
             fun main() {
-                Original::call();
+                original::call();
                         //^ unresolved
             }
-        } 
+        }
     """
     )
 
@@ -354,7 +372,8 @@ class ResolveFunctionTest : ResolveTestCase() {
     """
     )
 
-    fun `test resolve fully qualified path from the same module`() = checkByCode("""
+    fun `test resolve fully qualified path from the same module`() = checkByCode(
+        """
     module 0x1::M {
         struct Loan {}
         public fun call() acquires Loan {}
@@ -364,9 +383,25 @@ class ResolveFunctionTest : ResolveTestCase() {
                     //^  
         }
     }
-    """)
+    """
+    )
+
+    fun `test public script function can be resolved from import`() = checkByCode(
+        """
+    module 0x1::M {
+        public(script) fun call() {}
+                           //X
+    }    
+    #[test_only]
+    module 0x1::Tests {
+        use 0x1::M::call;
+                   //^
+    }
+    """
+    )
 
-    fun `test public script function available in test`() = checkByCode("""
+    fun `test public script function available in test`() = checkByCode(
+        """
     module 0x1::M {
         public(script) fun call() {}
                            //X
@@ -381,9 +416,45 @@ class ResolveFunctionTest : ResolveTestCase() {
             //^
         }
     }
-    """)
+    """
+    )
 
-    fun `test resolve fun in test_only module from another test_only`() = checkByCode("""
+    fun `test public script function available in entry function`() = checkByCode(
+        """
+    module 0x1::M {
+        public(script) fun call() {}
+                           //X
+    }    
+    module 0x1::main {
+        use 0x1::M::call;
+        
+        entry fun test_1() {
+            call();
+            //^
+        }
+    }
+    """
+    )
+
+    fun `test public script function available in public script function`() = checkByCode(
+        """
+    module 0x1::M {
+        public(script) fun call() {}
+                           //X
+    }    
+    module 0x1::main {
+        use 0x1::M::call;
+        
+        public(script) fun test_1() {
+            call();
+            //^
+        }
+    }
+    """
+    )
+
+    fun `test resolve fun in test_only module from another test_only`() = checkByCode(
+        """
     #[test_only] 
     module 0x1::M1 {
         public fun call() {}
@@ -398,9 +469,11 @@ class ResolveFunctionTest : ResolveTestCase() {
             //^
         }
     }
-    """)
+    """
+    )
 
-    fun `test test_only function is not accessible from non test_only module`() = checkByCode("""
+    fun `test test_only function is not accessible from non test_only module`() = checkByCode(
+        """
     module 0x1::M1 {
         #[test_only]
         public fun call() {}
@@ -412,23 +485,27 @@ class ResolveFunctionTest : ResolveTestCase() {
                //^ unresolved             
         }
     }
-    """)
+    """
+    )
 
-    fun `test test_only module is not accessible from non_test_only module`() = checkByCode("""
+    fun `test test_only module is not accessible from non_test_only module`() = checkByCode(
+        """
     #[test_only]
     module 0x1::M1 {
         public fun call() {}
     }        
     module 0x1::M2 {
         use 0x1::M1;
-               //^ unresolved 
         fun call() {
             M1::call();
+           //^ unresolved
         }
     }
-    """)
+    """
+    )
 
-    fun `test unittest functions are not accessible as items`() = checkByCode("""
+    fun `test unittest functions are not accessible as items`() = checkByCode(
+        """
     #[test_only]    
     module 0x1::M {
         #[test]
@@ -438,26 +515,30 @@ class ResolveFunctionTest : ResolveTestCase() {
            //^ unresolved 
         }
     }    
-    """)
+    """
+    )
 
-    fun `test unittest functions are not accessible as module items`() = checkByCode("""
+    fun `test unittest functions are not accessible as module items`() = checkByCode(
+        """
     #[test_only]    
     module 0x1::M1 {
         #[test]
-        public(script) fun test_a() {}
+        entry fun test_a() {}
     }    
     #[test_only]
     module 0x1::M2 {
         use 0x1::M1; 
         
-        public(script) fun main() {
+        entry fun main() {
             M1::test_a();
                //^ unresolved    
         }
     }    
-    """)
+    """
+    )
 
-    fun `test module and spec module blocks share the same namespace`() = checkByCode("""
+    fun `test module and spec module blocks share the same namespace`() = checkByCode(
+        """
     module 0x1::caller {
         public fun call() {}
                   //X
@@ -471,9 +552,11 @@ class ResolveFunctionTest : ResolveTestCase() {
     spec 0x1::main {
         use 0x1::caller::call;
     }
-    """)
+    """
+    )
 
-    fun `test friend function from another module with spaces after public`() = checkByCode("""
+    fun `test friend function from another module with spaces after public`() = checkByCode(
+        """
     module 0x1::A {
         friend 0x1::B; 
         public ( friend) fun call_a() {}
@@ -487,9 +570,11 @@ class ResolveFunctionTest : ResolveTestCase() {
                   //^
         }
     }
-    """)
+    """
+    )
 
-    fun `test use item inside function block`() = checkByCode("""
+    fun `test use item inside function block`() = checkByCode(
+        """
 module 0x1::string {
     public fun utf8() {}
               //X
@@ -501,9 +586,24 @@ module 0x1::main {
         //^
     }
 }        
-    """)
+    """
+    )
+
+    fun `test resolve use item`() = checkByCode(
+        """
+module 0x1::string {
+    public fun utf8() {}
+              //X
+}
+module 0x1::main {
+    use 0x1::string::utf8;
+                   //^
+}        
+    """
+    )
 
-    fun `test resolve with self alias`() = checkByCode("""
+    fun `test resolve with self alias`() = checkByCode(
+        """
 module 0x1::string {
     public fun utf8() {}
               //X
@@ -515,9 +615,11 @@ module 0x1::main {
                 //^
     }
 }        
-    """)
+    """
+    )
 
-    fun `test resolve inline function from same module`() = checkByCode("""
+    fun `test resolve inline function from same module`() = checkByCode(
+        """
 module 0x1::string {
     inline fun foreach<Element>(v: vector<Element>, f: |Element|) {}
               //X
@@ -526,9 +628,11 @@ module 0x1::string {
         //^
     }
 }        
-    """)
+    """
+    )
 
-    fun `test resolve inline function from different module`() = checkByCode("""
+    fun `test resolve inline function from different module`() = checkByCode(
+        """
 module 0x1::string {
     public inline fun foreach<Element>(v: vector<Element>, f: |Element|) {}
                       //X
@@ -540,9 +644,11 @@ module 0x1::main {
         //^
     }
 }
-    """)
+    """
+    )
 
-    fun `test inline function lambda variable`() = checkByCode("""
+    fun `test inline function lambda variable`() = checkByCode(
+        """
 module 0x1::m {
     public inline fun for_each<Element>(o: Element, f: |Element|) {}
     fun main() {
@@ -553,9 +659,11 @@ module 0x1::m {
         )
     }
 }        
-    """)
+    """
+    )
 
-    fun `test inline function lambda two variables`() = checkByCode("""
+    fun `test inline function lambda two variables`() = checkByCode(
+        """
 module 0x1::m {
     public inline fun for_each<Element>(o: Element, f: |Element|) {}
     fun main() {
@@ -566,9 +674,11 @@ module 0x1::m {
         )
     }
 }        
-    """)
+    """
+    )
 
-    fun `test resolve lambda function call expr`() = checkByCode("""
+    fun `test resolve lambda function call expr`() = checkByCode(
+        """
 module 0x1::mod {
     public inline fun fold<Accumulator, Element>(elem: Element, func: |Element| Accumulator): Accumulator {
                                                                //X
@@ -576,18 +686,22 @@ module 0x1::mod {
         //^
     }
 }        
-    """)
+    """
+    )
 
-    fun `test cannot resolve function to parameter`() = checkByCode("""
+    fun `test cannot resolve function to parameter`() = checkByCode(
+        """
 module 0x1::mod {
     public inline fun fold<Accumulator, Element>(elem: Element, func: |Element| Accumulator): Accumulator {
         elem(1);
         //^ unresolved
     }
 }        
-    """)
+    """
+    )
 
-    fun `test functions have separate namespace from variables`() = checkByCode("""
+    fun `test functions have separate namespace from variables`() = checkByCode(
+        """
 module 0x1::mod {
     fun name() {}
        //X
@@ -597,9 +711,41 @@ module 0x1::mod {
          //^       
     }
 }        
-    """)
+    """
+    )
 
-    fun `test resolve local function when module with same name is imported as Self`() = checkByCode("""
+    fun `test resolve local function when module with same name is imported`() = checkByCode(
+        """
+        module 0x1::royalty {}
+        module 0x1::m {
+            use 0x1::royalty;
+            public fun royalty() {}
+                        //X
+            public fun main() {
+                royalty();
+                //^
+            }
+        }        
+    """
+    )
+
+    fun `test resolve local function when module imported with the same alias`() = checkByCode(
+        """
+        module 0x1::myroyalty {}
+        module 0x1::m {
+            use 0x1::myroyalty as royalty;
+            public fun royalty() {}
+                        //X
+            public fun main() {
+                royalty();
+                //^
+            }
+        }        
+    """
+    )
+
+    fun `test resolve local function when module with same name is imported as Self`() = checkByCode(
+        """
         module 0x1::royalty {}
         module 0x1::m {
             use 0x1::royalty::Self;
@@ -610,24 +756,63 @@ module 0x1::mod {
                 //^
             }
         }        
-    """)
+    """
+    )
 
-    fun `test resolve local function when function with the same name imported`() = checkByCode("""
+    fun `test cannot resolve local function when duplicate function is imported`() = checkByCode(
+        """
         module 0x1::royalty {
             public fun royalty() {}
         }
         module 0x1::m {
             use 0x1::royalty::royalty;
             public fun royalty() {}
-                        //X
             public fun main() {
                 royalty();
-                //^
+                //^ unresolved
             }
         }        
-    """)
+    """
+    )
 
-    fun `test resolve spec fun defined in module spec`() = checkByCode("""
+    fun `test resolve spec fun from import`() = checkByCode(
+        """
+        module 0x1::m {
+        }        
+        spec 0x1::m {
+            spec module {
+                fun spec_sip_hash();
+                    //X
+            }
+        }
+        module 0x1::main {
+            use 0x1::m::spec_sip_hash;
+                       //^
+        }
+    """
+    )
+
+    fun `test cannot resolve spec fun main scope`() = checkByCode(
+        """
+        module 0x1::m {
+        }        
+        spec 0x1::m {
+            spec module {
+                fun spec_sip_hash();
+            }
+        }
+        module 0x1::main {
+            use 0x1::m::spec_sip_hash;
+            fun main() {
+                spec_sip_hash();
+                //^ unresolved
+            }
+        }
+    """
+    )
+
+    fun `test resolve spec fun defined in module spec`() = checkByCode(
+        """
         module 0x1::m {
         }        
         spec 0x1::m {
@@ -643,9 +828,11 @@ module 0x1::mod {
                        //^
             }
         }
-    """)
+    """
+    )
 
-    fun `test verify_only function accessible in spec`() = checkByCode("""
+    fun `test verify_only function accessible in spec`() = checkByCode(
+        """
         module 0x1::m {
             #[verify_only]
             fun call(): u8 { 1 }
@@ -656,9 +843,11 @@ module 0x1::mod {
                        //^
             }
         }        
-    """)
+    """
+    )
 
-    fun `test verify_only function accessible in other verify_only function`() = checkByCode("""
+    fun `test verify_only function accessible in other verify_only function`() = checkByCode(
+        """
         module 0x1::m {
             #[verify_only]
             fun call(): u8 { 1 }
@@ -669,9 +858,11 @@ module 0x1::mod {
                        //^
             }
         }        
-    """)
+    """
+    )
 
-    fun `test verify_only not accessible in the regular code`() = checkByCode("""
+    fun `test verify_only not accessible in the regular code for local functions`() = checkByCode(
+        """
         module 0x1::m {
             #[verify_only]
             fun call(): u8 { 1 }
@@ -679,21 +870,37 @@ module 0x1::mod {
                 let _ = call();
                        //^ unresolved
             }
-        }        
-    """)
+        }
+    """
+    )
 
-    fun `test cannot resolve non-test-only import into test-only item`() = checkByCode("""
+    fun `test test_only not accessible in the regular code for local functions`() = checkByCode(
+        """
         module 0x1::m {
             #[test_only]
-            public fun call() {}
-        }        
-        module 0x1::main {
-            use 0x1::m::call;
-                        //^ unresolved
+            fun call(): u8 { 1 }
+            fun main() {
+                let _ = call();
+                       //^ unresolved
+            }
         }
-    """)
+    """
+    )
+
+//    fun `test entry function not accessible from non-entry code`() = checkByCode(
+//        """
+//        module 0x1::m {
+//            public(script) fun call() { 1 }
+//            fun main() {
+//                let _ = call();
+//                       //^ unresolved
+//            }
+//        }
+//    """
+//    )
 
-    fun `test resolve local test-only import into test-only item`() = checkByCode("""
+    fun `test resolve local test-only import into test-only item`() = checkByCode(
+        """
         module 0x1::m {
             #[test_only]
             public fun call() {}
@@ -706,9 +913,11 @@ module 0x1::mod {
                         //^
             }
         }
-    """)
+    """
+    )
 
-    fun `test resolve use item spec fun defined in module spec verify scope always available`() = checkByCode("""
+    fun `test resolve use item spec fun defined in module spec verify scope always available`() = checkByCode(
+        """
         module 0x1::m {
         }        
         spec 0x1::m {
@@ -724,5 +933,175 @@ module 0x1::mod {
                 spec_sip_hash(); 1
             }
         }
+    """
+    )
+
+    fun `test resolve function to another module with module alias`() = checkByCode(
+        """
+    module 0x1::m {
+        public fun call() {}
+                 //X
+    }
+    
+    module 0x1::main {
+        use 0x1::m as m_alias;
+        
+        fun main() {
+            m_alias::call();
+                    //^
+        }
+    }    
+    """
+    )
+
+    fun `test resolve function to another module with local module alias`() = checkByCode(
+        """
+    module 0x1::m {
+        public fun call() {}
+                 //X
+    }
+    
+    module 0x1::main {
+        fun main() {
+            use 0x1::m as m_alias;
+            m_alias::call();
+                    //^
+        }
+    }    
+    """
+    )
+
+    fun `test function with module alias cannot use original module name`() = checkByCode(
+            """
+    module 0x1::m {
+        public fun call() {}
+    }
+    
+    module 0x1::main {
+        use 0x1::m as m_alias;
+        
+        fun main() {
+            m::call();
+             //^ unresolved
+        }
+    }    
+    """
+        )
+
+    fun `test test function is not available in name resolution`() = checkByCode(
+        """
+    module 0x1::main {
+        public fun call() { test_main(); }
+                              //^ unresolved
+        #[test]
+        fun test_main() {}
+    }
+    """
+    )
+
+    fun `test resolve function from use group in use`() = checkByCode("""
+        module 0x1::m {
+            public fun call() {}
+                      //X
+        }        
+        module 0x1::main {
+            use 0x1::m::{call};
+                        //^
+        }
+    """)
+
+    fun `test resolve function from use group`() = checkByCode("""
+        module 0x1::m {
+            public fun call() {}
+                      //X
+        }        
+        module 0x1::main {
+            use 0x1::m::{call};
+            public fun main() {
+                call();
+                //^
+            }
+        }
+    """)
+
+    fun `test cannot resolve function that friend without friend statement`() = checkByCode("""
+        module 0x1::m {
+            public(friend) fun call() {}
+        }        
+        module 0x1::main {
+            use 0x1::m::call;
+            fun main() {
+                call()
+                //^ unresolved
+            }
+        }
+    """)
+
+    fun `test unresolved if main scope and test_only item`() = checkByCode("""
+module 0x1::minter {
+    struct S {}
+    public fun mint() {}    
+}        
+module 0x1::main {
+    #[test_only]
+    use 0x1::minter::{Self, mint};
+    
+    public fun main() {
+        mint();
+        //^ unresolved 
+    }
+}          
+    """)
+
+    fun `test unresolved if main scope and verify_only item`() = checkByCode("""
+module 0x1::minter {
+    struct S {}
+    public fun mint() {}    
+}        
+module 0x1::main {
+    #[verify_only]
+    use 0x1::minter::{Self, mint};
+    
+    public fun main() {
+        mint();
+        //^ unresolved 
+    }
+}          
     """)
+
+    fun `test test function can be imported`() = checkByCode("""
+module 0x1::m1 {
+    #[test]
+    public fun test_a() {}
+                //X
+}  
+module 0x1::m2 {
+    use 0x1::m1::test_a;
+               //^
+}    """)
+
+    fun `test private test function cannot be imported`() = checkByCode("""
+module 0x1::m1 {
+    #[test]
+    fun test_a() {}
+}  
+module 0x1::m2 {
+    use 0x1::m1::test_a;
+               //^ unresolved
+}    """)
+
+    fun `test test function cannot be used`() = checkByCode("""
+module 0x1::m1 {
+    #[test]
+    public fun test_a() {}
+}  
+module 0x1::m2 {
+    use 0x1::m1::test_a;
+    
+    #[test_only]
+    fun main() {
+        test_a();
+        //^ unresolved
+    }
+}    """)
 }
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveItemsTreeProjectTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveItemsTreeProjectTest.kt
index b10298c30..fdabe7b63 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveItemsTreeProjectTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveItemsTreeProjectTest.kt
@@ -284,7 +284,10 @@ class ResolveItemsTreeProjectTest : ResolveProjectTestCase() {
                 moveToml(
                     """
         [package]
-        name = "MoveStdlib"        
+        name = "MoveStdlib"       
+         
+        [addresses]
+        Std = "0x1"
                 """
                 )
                 sources {
@@ -346,7 +349,7 @@ class ResolveItemsTreeProjectTest : ResolveProjectTestCase() {
         }
     }
 
-    fun `test resolve module by address value`() = checkByFileTree {
+    fun `test resolve module by address value with different address name`() = checkByFileTree {
         moveToml(
             """
         [package]
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveModulesTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveModulesTest.kt
index a3530487b..a011b26f3 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveModulesTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveModulesTest.kt
@@ -1,8 +1,33 @@
 package org.move.lang.resolve
 
+import org.move.utils.tests.NamedAddress
 import org.move.utils.tests.resolve.ResolveTestCase
 
 class ResolveModulesTest : ResolveTestCase() {
+    fun `test use module Self`() = checkByCode(
+        """
+    module 0x1::transaction {
+                  //X
+    }
+    module 0x1::main {
+        use 0x1::transaction::Self;
+                             //^
+    }
+    """
+    )
+
+    fun `test use module Self in use group`() = checkByCode(
+        """
+    module 0x1::transaction {
+                  //X
+    }
+    module 0x1::main {
+        use 0x1::transaction::{Self};
+                              //^
+    }
+    """
+    )
+
     fun `test import module itself with Self import`() = checkByCode(
         """
     address 0x1 {
@@ -22,11 +47,30 @@ class ResolveModulesTest : ResolveTestCase() {
     """
     )
 
-    fun `test resolve Self to current module`() = checkByCode(
+    fun `test import module itself with Self group import`() = checkByCode(
         """
+    address 0x1 {
         module Transaction {
              //X
             fun create() {}
+        }
+        
+        module M {
+            use 0x1::Transaction::{Self};
+            fun main() {
+                let a = Transaction::create();
+                      //^
+            }
+        }
+    }        
+    """
+    )
+
+    fun `test resolve Self to current module`() = checkByCode(
+        """
+        module 0x1::transaction {
+                    //X
+            fun create() {}
             fun main() {
                 let a = Self::create();
                       //^
@@ -37,7 +81,7 @@ class ResolveModulesTest : ResolveTestCase() {
 
     fun `test resolve module to imported module with alias`() = checkByCode(
         """
-        module M {
+        module 0x1::m {
             use 0x1::Transaction as MyTransaction;
                                   //X
             fun main() {
@@ -50,16 +94,11 @@ class ResolveModulesTest : ResolveTestCase() {
 
     fun `test cannot resolve module if imported one has different address`() = checkByCode(
         """
-    address 0x1 {
-        module Transaction {}
-    }
-    
-    address 0x2 {
-        module M {
-            fun main() {
-                let a = 0x3::Transaction::create();
-                           //^ unresolved
-            }
+    module 0x1::transaction {}
+    module 0x1::m {
+        fun main() {
+            let a = 0x3::transaction::create();
+                         //^ unresolved
         }
     }
     """
@@ -290,6 +329,37 @@ class ResolveModulesTest : ResolveTestCase() {
                //X
     """)
 
+    fun `test resolve friend module`() = checkByCode("""
+    module 0x1::myfriend {}
+                 //X
+    module 0x1::main {
+        friend 0x1::myfriend;
+                   //^ 
+    }    
+    """)
+
+    @NamedAddress("aptos_std", "0x1")
+    fun `test resolve friend module with named address`() = checkByCode("""
+    module aptos_std::myfriend {}
+                      //X
+    module 0x1::main {
+        friend aptos_std::myfriend;
+                           //^ 
+    }    
+    """)
+
+    fun `test cannot resolve path inside friend to a function`() = checkByCode("""
+    module 0x1::myfriend {
+        public fun call() {}
+    }
+    module 0x1::main {
+        use 0x1::myfriend;
+        
+        friend myfriend::call;
+                         //^ unresolved 
+    }    
+    """)
+
     fun `test friend no module resolution for test_only modules in non test_only case`() = checkByCode("""
     module 0x1::M {
         friend 0x1::MTest;
@@ -327,4 +397,53 @@ module 0x1::string_tests {
     }
 }        
     """)
+
+    fun `test unresolved named address`() = checkByCode("""
+        module 0x1::m {
+            use aptos_framework::account;
+                //^ unresolved
+        }        
+    """)
+
+    fun `test unresolved value address`() = checkByCode("""
+        module 0x1::m {
+            use 0x1::account;
+                //^ unresolved
+        }        
+    """)
+
+    @NamedAddress("aptos_framework", "0x1")
+    fun `test resolve module from import with named address`() = checkByCode("""
+        module aptos_framework::m1 {}
+                              //X
+        module 0x1::m {
+            use aptos_framework::m1;
+                               //^
+        }        
+    """)
+
+    @NamedAddress("aptos_framework", "0x1")
+    fun `test resolve module from import with value address`() = checkByCode("""
+        module aptos_framework::m1 {}
+                              //X
+        module 0x1::m {
+            use 0x1::m1;
+                   //^
+        }        
+    """)
+
+    fun `test cannot resolve module with unknown named address`() = checkByCode("""
+        module aptos_framework::m1 {}
+        module 0x1::m {
+            use aptos_framework::m1;
+                               //^ unresolved
+        }        
+    """)
+
+    fun `test cannot resolve named address in incomplete path use stmt`() = checkByCode("""
+        module 0x1::m {
+            use aptos_framework
+               //^ unresolved
+        }        
+    """)
 }
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveNamedAddressTreeProjectTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveNamedModulePathTreeProjectTest.kt
similarity index 96%
rename from src/test/kotlin/org/move/lang/resolve/ResolveNamedAddressTreeProjectTest.kt
rename to src/test/kotlin/org/move/lang/resolve/ResolveNamedModulePathTreeProjectTest.kt
index f93e5baef..dfd9d296e 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveNamedAddressTreeProjectTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveNamedModulePathTreeProjectTest.kt
@@ -5,7 +5,7 @@ import org.move.utils.tests.FileTreeBuilder
 import org.move.utils.tests.resolve.ResolveProjectTestCase
 import org.toml.lang.psi.TomlKeySegment
 
-class ResolveNamedAddressTreeProjectTest : ResolveProjectTestCase() {
+class ResolveNamedModulePathTreeProjectTest : ResolveProjectTestCase() {
     fun `test resolve named address to address`() = checkByFileTree {
         moveToml("""
         [addresses]
@@ -128,9 +128,8 @@ class ResolveNamedAddressTreeProjectTest : ResolveProjectTestCase() {
         )
         sources {
             move("main.move", """
-            module 0x1::M {
-                use Std::Reflect;
-                    //^
+            module Std::M {
+                  //^
             }     
             """)
         }
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveSpecsTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveSpecsTest.kt
index 042994812..df7d9365b 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveSpecsTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveSpecsTest.kt
@@ -257,6 +257,19 @@ class ResolveSpecsTest: ResolveTestCase() {
     }
     """)
 
+    fun `test another module consts are not accessible from non-msl`() = checkByCode("""
+    module 0x1::M {
+        const MY_CONST: u8 = 1;
+    }    
+    module 0x1::M2 {
+        use 0x1::M;
+        fun main() {
+            M::MY_CONST;
+                 //^ unresolved            
+        }
+    }
+    """)
+
     fun `test another module consts are accessible from msl`() = checkByCode("""
     module 0x1::M {
         const MY_CONST: u8 = 1;
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveStructFieldsTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveStructFieldsTest.kt
index 52a3b49aa..ac5907ea6 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveStructFieldsTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveStructFieldsTest.kt
@@ -87,10 +87,10 @@ class ResolveStructFieldsTest : ResolveTestCase() {
         """
         module 0x1::M {
             struct CapState<phantom Feature> has key { delegates: vector<address> }
-                                                     //X
+                                                         //X
             fun m() acquires CapState {
                 borrow_global_mut<CapState<u8>>(@0x1).delegates;
-                                                     //^
+                                                       //^
             }
         }    
         """
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveStubOnlyTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveStubOnlyTest.kt
index ba2d65af8..052999ae9 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveStubOnlyTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveStubOnlyTest.kt
@@ -48,76 +48,76 @@ class ResolveStubOnlyTest : ResolveProjectTestCase() {
         }
     }
 
-    fun `test stub resolve module function`() = stubOnlyResolve {
-        namedMoveToml("MyPackage")
-        sources {
-            move(
-                "module.move", """
-            module 0x1::Module {
-                public fun call() {}
-                          //X
-            }
-            """
-            )
-            move(
-                "main.move", """
-            script {
-                use 0x1::Module;
-                fun main() {
-                    Module::call();
-                          //^
-                }
-            }
-            """
-            )
-        }
-    }
+//    fun `test stub resolve module function`() = stubOnlyResolve {
+//        namedMoveToml("MyPackage")
+//        sources {
+//            move(
+//                "module.move", """
+//            module 0x1::Module {
+//                public fun call() {}
+//                          //X
+//            }
+//            """
+//            )
+//            move(
+//                "main.move", """
+//            script {
+//                use 0x1::Module;
+//                fun main() {
+//                    Module::call();
+//                          //^
+//                }
+//            }
+//            """
+//            )
+//        }
+//    }
 
-    fun `test stub resolve fq module function`() = stubOnlyResolve {
-        namedMoveToml("MyPackage")
-        sources {
-            move(
-                "module.move", """
-            module 0x1::Module {
-                public fun call() {}
-                          //X
-            }
-            """
-            )
-            move(
-                "main.move", """
-            script {
-                fun main() {
-                    0x1::Module::call();
-                               //^
-                }
-            }
-            """
-            )
-        }
-    }
+//    fun `test stub resolve fq module function`() = stubOnlyResolve {
+//        namedMoveToml("MyPackage")
+//        sources {
+//            move(
+//                "module.move", """
+//            module 0x1::Module {
+//                public fun call() {}
+//                          //X
+//            }
+//            """
+//            )
+//            move(
+//                "main.move", """
+//            script {
+//                fun main() {
+//                    0x1::Module::call();
+//                               //^
+//                }
+//            }
+//            """
+//            )
+//        }
+//    }
 
-    fun `test stub resolve module struct`() = stubOnlyResolve {
-        namedMoveToml("MyPackage")
-        sources {
-            move(
-                "module.move", """
-            module 0x1::Module {
-                struct S {}
-                     //X
-            }
-            """
-            )
-            move(
-                "main.move", """
-            script {
-                use 0x1::Module;
-                fun main(s: Module::S) {
-                                  //^
-                }
-            }
-            """
-            )
-        }
-    }
+//    fun `test stub resolve module struct`() = stubOnlyResolve {
+//        namedMoveToml("MyPackage")
+//        sources {
+//            move(
+//                "module.move", """
+//            module 0x1::Module {
+//                struct S {}
+//                     //X
+//            }
+//            """
+//            )
+//            move(
+//                "main.move", """
+//            script {
+//                use 0x1::Module;
+//                fun main(s: Module::S) {
+//                                  //^
+//                }
+//            }
+//            """
+//            )
+//        }
+//    }
 }
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveTypesTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveTypesTest.kt
index bedd9d33e..bc2573a80 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveTypesTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveTypesTest.kt
@@ -351,4 +351,17 @@ module 0x1::m {
             }
         }        
     """)
+
+    fun `test module resolution not available on type position`() = checkByCode("""
+        module 0x1::Transaction {
+            struct Type {
+                val: u8                   
+            }
+        }
+        module 0x1::M {
+            fun main(a: 0x1::Transaction::Transaction) {
+                                           //^ unresolved
+            }
+        }
+    """)
 }
diff --git a/src/test/kotlin/org/move/lang/resolve/ResolveVariablesTest.kt b/src/test/kotlin/org/move/lang/resolve/ResolveVariablesTest.kt
index 8537dd22e..bfe5f4b72 100644
--- a/src/test/kotlin/org/move/lang/resolve/ResolveVariablesTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/ResolveVariablesTest.kt
@@ -1,5 +1,6 @@
 package org.move.lang.resolve
 
+import org.move.utils.tests.NamedAddress
 import org.move.utils.tests.resolve.ResolveTestCase
 
 class ResolveVariablesTest : ResolveTestCase() {
@@ -290,25 +291,25 @@ module 0x1::string_tests {
 }
     """)
 
-    fun `test resolve const item with same name imported expected failure`() = checkByCode("""
-module 0x1::string {
-    const ERR_ADMIN: u64 = 1;
-}        
-#[test_only]
-module 0x1::string_tests {
-    use 0x1::string::ERR_ADMIN;
-
-    const ERR_ADMIN: u64 = 1;
-            //X
-
-    #[test]
-    #[expected_failure(abort_code = ERR_ADMIN)]
-                                     //^
-    fun test_abort() {
-        
-    }
-}
-    """)
+//    fun `test resolve const item with same name imported expected failure`() = checkByCode("""
+//module 0x1::string {
+//    const ERR_ADMIN: u64 = 1;
+//}
+//#[test_only]
+//module 0x1::string_tests {
+//    use 0x1::string::ERR_ADMIN;
+//
+//    const ERR_ADMIN: u64 = 1;
+//            //X
+//
+//    #[test]
+//    #[expected_failure(abort_code = ERR_ADMIN)]
+//                                     //^
+//    fun test_abort() {
+//
+//    }
+//}
+//    """)
 
     fun `test resolve const item same module expected failure`() = checkByCode("""
 #[test_only]
@@ -348,4 +349,40 @@ module 0x1::string_tests {
             }
         }        
     """)
+
+    fun `test cannot resolve path address`() = checkByCode("""
+        module 0x1::m {
+            fun main() {
+                0x1::;
+                //^ unresolved
+            }
+        }        
+    """)
+
+    fun `test resolve attribute location`() = checkByCode("""
+        module 0x1::m {
+                  //X  
+            fun main() {
+            }
+            #[test(location=0x1::m)]
+                               //^
+            fun test_main() {
+                
+            }
+        }        
+    """)
+
+    @NamedAddress("aptos_std", "0x1")
+    fun `test resolve attribute location for named address`() = checkByCode("""
+        module aptos_std::m {
+                  //X  
+            fun main() {
+            }
+            #[test(location=aptos_std::m)]
+                                     //^
+            fun test_main() {
+                
+            }
+        }        
+    """)
 }
diff --git a/src/test/kotlin/org/move/lang/resolve/compilerV2/ReceiverStyleFunctionTest.kt b/src/test/kotlin/org/move/lang/resolve/compilerV2/ReceiverStyleFunctionTest.kt
index 4c24c29db..9b56b7493 100644
--- a/src/test/kotlin/org/move/lang/resolve/compilerV2/ReceiverStyleFunctionTest.kt
+++ b/src/test/kotlin/org/move/lang/resolve/compilerV2/ReceiverStyleFunctionTest.kt
@@ -1,5 +1,6 @@
 package org.move.lang.resolve.compilerV2
 
+import org.move.ide.inspections.fixes.CompilerV2Feat.PUBLIC_PACKAGE
 import org.move.ide.inspections.fixes.CompilerV2Feat.RECEIVER_STYLE_FUNCTIONS
 import org.move.utils.tests.CompilerV2Features
 import org.move.utils.tests.resolve.ResolveTestCase
@@ -21,6 +22,17 @@ class ReceiverStyleFunctionTest: ResolveTestCase() {
         }        
     """)
 
+    fun `test resolve self parameter`() = checkByCode("""
+        module 0x1::main {
+            struct S { x: u64 }
+            fun receiver(self: S, y: u64): u64 {
+                         //X
+                self.x + y
+                //^
+            }
+        }        
+    """)
+
     fun `test resolve receiver function with reference`() = checkByCode("""
         module 0x1::main {
             struct S { x: u64 }
@@ -178,4 +190,50 @@ class ReceiverStyleFunctionTest: ResolveTestCase() {
             }
         }                
     """)
+
+    fun `test friend function method`() = checkByCode("""
+        module 0x1::m {
+            friend 0x1::main;
+            struct S { x: u64 }
+            public(friend) fun receiver(self: &S): u64 { self.x }
+                               //X
+        }
+        module 0x1::main {
+            use 0x1::m::S;
+            fun main(s: S) {
+                s.receiver();
+                  //^
+            }
+        }        
+    """)
+
+    @CompilerV2Features(RECEIVER_STYLE_FUNCTIONS, PUBLIC_PACKAGE)
+    fun `test public package method`() = checkByCode("""
+        module 0x1::m {
+            struct S { x: u64 }
+            public(package) fun receiver(self: &S): u64 { self.x }
+                                  //X
+        }
+        module 0x1::main {
+            use 0x1::m::S;
+            fun main(s: S) {
+                s.receiver();
+                  //^
+            }
+        }        
+    """)
+
+    fun `test friend function method unresolved`() = checkByCode("""
+        module 0x1::m {
+            struct S { x: u64 }
+            public(friend) fun receiver(self: &S): u64 { self.x }
+        }
+        module 0x1::main {
+            use 0x1::m::S;
+            fun main(s: S) {
+                s.receiver();
+                  //^ unresolved
+            }
+        }        
+    """)
 }
\ No newline at end of file
diff --git a/src/test/kotlin/org/move/utils/tests/MvLightTestBase.kt b/src/test/kotlin/org/move/utils/tests/MvLightTestBase.kt
index be36d86c8..d90cc91d3 100644
--- a/src/test/kotlin/org/move/utils/tests/MvLightTestBase.kt
+++ b/src/test/kotlin/org/move/utils/tests/MvLightTestBase.kt
@@ -10,5 +10,6 @@ abstract class MvLightTestBase: BasePlatformTestCase() {
         setRegistryKey("org.move.debug.enabled", isDebugMode)
 
         this.handleCompilerV2Annotations(project)
+        this.handleNamedAddressAnnotations(project)
     }
 }
\ No newline at end of file
diff --git a/src/test/kotlin/org/move/utils/tests/MvTestBase.kt b/src/test/kotlin/org/move/utils/tests/MvTestBase.kt
index 3ae890610..a5ef879e1 100644
--- a/src/test/kotlin/org/move/utils/tests/MvTestBase.kt
+++ b/src/test/kotlin/org/move/utils/tests/MvTestBase.kt
@@ -6,12 +6,15 @@
 package org.move.utils.tests
 
 import com.intellij.codeInspection.InspectionProfileEntry
+import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.testFramework.UsefulTestCase
 import com.intellij.testFramework.enableInspectionTool
 import org.intellij.lang.annotations.Language
 import org.move.cli.settings.moveSettings
+import org.move.cli.tests.NamedAddressService
+import org.move.cli.tests.NamedAddressServiceTestImpl
 import org.move.ide.inspections.fixes.CompilerV2Feat
 import org.move.ide.inspections.fixes.CompilerV2Feat.*
 import org.move.utils.tests.base.MvTestCase
@@ -36,6 +39,11 @@ annotation class WithEnabledInspections(vararg val inspections: KClass<out Inspe
 @Retention(AnnotationRetention.RUNTIME)
 annotation class CompilerV2Features(vararg val features: CompilerV2Feat)
 
+@Inherited
+@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class NamedAddress(val name: String, val value: String)
+
 fun UsefulTestCase.handleCompilerV2Annotations(project: Project) {
     val enabledCompilerV2 = this.findAnnotationInstance<CompilerV2Features>()
     if (enabledCompilerV2 != null) {
@@ -53,6 +61,14 @@ fun UsefulTestCase.handleCompilerV2Annotations(project: Project) {
     }
 }
 
+fun UsefulTestCase.handleNamedAddressAnnotations(project: Project) {
+    val namedAddresses = this.findAnnotationInstances<NamedAddress>()
+    val namedAddressService = project.service<NamedAddressService>() as NamedAddressServiceTestImpl
+    for (namedAddress in namedAddresses) {
+        namedAddressService.namedAddresses[namedAddress.name] = namedAddress.value
+    }
+}
+
 abstract class MvTestBase: MvLightTestBase(),
                            MvTestCase {
     protected val fileName: String
diff --git a/src/test/kotlin/org/move/utils/tests/Settings.kt b/src/test/kotlin/org/move/utils/tests/Settings.kt
index c5dc5d900..5d0846547 100644
--- a/src/test/kotlin/org/move/utils/tests/Settings.kt
+++ b/src/test/kotlin/org/move/utils/tests/Settings.kt
@@ -5,3 +5,7 @@ import junit.framework.TestCase
 /** Tries to find the specified annotation on the current test method and then on the current class */
 inline fun <reified T : Annotation> TestCase.findAnnotationInstance(): T? =
     javaClass.getMethod(name).getAnnotation(T::class.java) ?: javaClass.getAnnotation(T::class.java)
+
+/** Tries to find the specified annotation on the current test method and then on the current class */
+inline fun <reified T : Annotation> TestCase.findAnnotationInstances(): Array<T> =
+    javaClass.getMethod(name).getAnnotationsByType(T::class.java) ?: javaClass.getAnnotationsByType(T::class.java)
diff --git a/src/test/kotlin/org/move/utils/tests/annotation/MvAnnotationTestFixture.kt b/src/test/kotlin/org/move/utils/tests/annotation/MvAnnotationTestFixture.kt
index 1c741ce23..b2cf780e5 100644
--- a/src/test/kotlin/org/move/utils/tests/annotation/MvAnnotationTestFixture.kt
+++ b/src/test/kotlin/org/move/utils/tests/annotation/MvAnnotationTestFixture.kt
@@ -24,7 +24,7 @@ class MvAnnotationTestFixture(
     val codeInsightFixture: CodeInsightTestFixture,
     private var annotatorClasses: List<KClass<out MvAnnotatorBase>> = emptyList(),
     private var inspectionClasses: List<KClass<out InspectionProfileEntry>> = emptyList(),
-) : BaseFixture() {
+): BaseFixture() {
     val project: Project get() = codeInsightFixture.project
     lateinit var enabledInspections: List<InspectionProfileEntry>
 
@@ -63,7 +63,10 @@ class MvAnnotationTestFixture(
         checkByText(text, checkWarn = false, checkWeakWarn = false, checkInfo = false)
 
     private fun configureByText(text: String): PsiFile {
-        return codeInsightFixture.configureByText("main.move", replaceCaretMarker(text.trimIndent()))
+        val psiFile = codeInsightFixture.configureByText("main.move", replaceCaretMarker(text.trimIndent()))
+        // build indexes
+//        IndexingTestUtil.waitUntilIndexesAreReady(codeInsightFixture.project)
+        return psiFile
     }
 
     fun checkByText(
@@ -131,6 +134,7 @@ class MvAnnotationTestFixture(
             "No /*caret*/ comment, add it to the place where fix is expected"
         }
         val file = configureByText(before)
+
         codeInsightFixture.checkHighlighting(checkWarn, checkInfo, checkWeakWarn)
         applyQuickFix(fixName)
         codeInsightFixture.checkResult(replaceCaretMarker(after.trimIndent()))
diff --git a/src/test/kotlin/org/move/utils/tests/base/TestCase.kt b/src/test/kotlin/org/move/utils/tests/base/TestCase.kt
index 6b50d4185..a57b1c0f5 100644
--- a/src/test/kotlin/org/move/utils/tests/base/TestCase.kt
+++ b/src/test/kotlin/org/move/utils/tests/base/TestCase.kt
@@ -1,6 +1,5 @@
 package org.move.utils.tests.base
 
-import org.move.utils.tests.base.TestCase.Companion
 import java.nio.file.Path
 import java.nio.file.Paths
 
diff --git a/src/test/kotlin/org/move/utils/tests/completion/MoveCompletionTestFixture.kt b/src/test/kotlin/org/move/utils/tests/completion/MoveCompletionTestFixture.kt
index da310f82f..6980e4b05 100644
--- a/src/test/kotlin/org/move/utils/tests/completion/MoveCompletionTestFixture.kt
+++ b/src/test/kotlin/org/move/utils/tests/completion/MoveCompletionTestFixture.kt
@@ -16,6 +16,7 @@ class MvCompletionTestFixture(
     fun invokeCompletion(@Language("Move") code: String): List<LookupElement> {
         prepare(code)
         val completions = myFixture.completeBasic()
+        check(completions != null) { "Only a single completion item" }
         return completions.toList()
     }
 
@@ -69,6 +70,10 @@ class MvCompletionTestFixture(
         val lookups = myFixture.completeBasic()
 
         checkNotNull(lookups) {
+            "Only a single completion returned, cannot be used with this test, " +
+                    "possibly change the test to doSingleCompletion()"
+        }
+        check(lookups.isNotEmpty()) {
             "Expected completions that contain $variants, but no completions found"
         }
         for (variant in variants) {
diff --git a/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestCase.kt b/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestCase.kt
index 5eb31cc40..8d66993f8 100644
--- a/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestCase.kt
+++ b/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestCase.kt
@@ -13,7 +13,8 @@ abstract class ResolveTestCase : MvTestBase() {
     ) {
         InlineFile(code, "main.move")
 
-        val (refElement, data, offset) = myFixture.findElementWithDataAndOffsetInEditor<MvReferenceElement>("^")
+        val (refElement, data, offset) =
+            myFixture.findElementWithDataAndOffsetInEditor<MvReferenceElement>("^")
 
         if (data == "unresolved") {
             val resolved = refElement.reference?.resolve()
diff --git a/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestUtils.kt b/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestUtils.kt
index 35a0de95e..833fe23a9 100644
--- a/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestUtils.kt
+++ b/src/test/kotlin/org/move/utils/tests/resolve/ResolveTestUtils.kt
@@ -3,6 +3,7 @@ package org.move.utils.tests.resolve
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
+import org.move.lang.core.resolve.ref.MvPolyVariantReference
 
 fun checkResolvedFile(
     actualResolveFile: VirtualFile,
@@ -31,9 +32,17 @@ sealed class TestResolveResult {
 
 fun PsiElement.findReference(offset: Int): PsiReference? = findReferenceAt(offset - textRange.startOffset)
 
-fun PsiElement.checkedResolve(offset: Int): PsiElement {
+fun PsiElement.checkedResolve(offset: Int, errorMessagePrefix: String = ""): PsiElement {
     val reference = findReference(offset) ?: error("element doesn't have reference")
-    val resolved = reference.resolve() ?: error("Failed to resolve `$text`")
+    val resolved = reference.resolve() ?: run {
+        val multiResolve = (reference as? MvPolyVariantReference)?.multiResolve().orEmpty()
+        check(multiResolve.size != 1)
+        if (multiResolve.isEmpty()) {
+            error("${errorMessagePrefix}Failed to resolve $text")
+        } else {
+            error("${errorMessagePrefix}Failed to resolve $text, multiple variants:\n${multiResolve.joinToString()}")
+        }
+    }
 
     check(reference.isReferenceTo(resolved)) {
         "Incorrect `isReferenceTo` implementation in `${reference.javaClass.name}`"
diff --git a/src/test/resources/org/move/lang/parser/complete/access_control.txt b/src/test/resources/org/move/lang/parser/complete/access_control.txt
index 25b53f6be..56ea09ea5 100644
--- a/src/test/resources/org/move/lang/parser/complete/access_control.txt
+++ b/src/test/resources/org/move/lang/parser/complete/access_control.txt
@@ -189,9 +189,10 @@ FILE
             MvAccessSpecifierListImpl(ACCESS_SPECIFIER_LIST)
               MvAccessSpecifierImpl(ACCESS_SPECIFIER)
                 MvPathImpl(PATH)
-                  MvFQModuleRefImpl(FQ_MODULE_REF)
-                    MvAddressRefImpl(ADDRESS_REF)
-                      PsiElement(DIEM_ADDRESS)('0x42')
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      MvPathAddressImpl(PATH_ADDRESS)
+                        PsiElement(DIEM_ADDRESS)('0x42')
                     PsiElement(::)('::')
                     PsiElement(*)('*')
                   PsiElement(::)('::')
@@ -216,9 +217,10 @@ FILE
             MvAccessSpecifierListImpl(ACCESS_SPECIFIER_LIST)
               MvAccessSpecifierImpl(ACCESS_SPECIFIER)
                 MvPathImpl(PATH)
-                  MvFQModuleRefImpl(FQ_MODULE_REF)
-                    MvAddressRefImpl(ADDRESS_REF)
-                      PsiElement(DIEM_ADDRESS)('0x42')
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      MvPathAddressImpl(PATH_ADDRESS)
+                        PsiElement(DIEM_ADDRESS)('0x42')
                     PsiElement(::)('::')
                     PsiElement(IDENTIFIER)('m')
                   PsiElement(::)('::')
@@ -486,7 +488,7 @@ FILE
                   PsiElement(()('(')
                   MvAddressSpecifierArgImpl(ADDRESS_SPECIFIER_ARG)
                     MvPathImpl(PATH)
-                      MvModuleRefImpl(MODULE_REF)
+                      MvPathImpl(PATH)
                         PsiElement(IDENTIFIER)('signer')
                       PsiElement(::)('::')
                       PsiElement(IDENTIFIER)('address_of')
diff --git a/src/test/resources/org/move/lang/parser/complete/attributes.move b/src/test/resources/org/move/lang/parser/complete/attributes.move
index 952062f2c..a680cc46f 100644
--- a/src/test/resources/org/move/lang/parser/complete/attributes.move
+++ b/src/test/resources/org/move/lang/parser/complete/attributes.move
@@ -32,7 +32,7 @@ module 0x1::M {
     #[show(book_orders_sdk, book_price_levels_sdk)]
     fun test() {}
 
-    #[expected_failure(abort_code = liquidswap::liquidity_pool::ERR_ADMIN)]
+    #[expected_failure(abort_code = liquidswap::liquidity_pool::ERR_ADMIN, location=0x1::liquidity_pool)]
     fun abort_test() {}
 
     #[allow(lint(self_transfer))]
diff --git a/src/test/resources/org/move/lang/parser/complete/attributes.txt b/src/test/resources/org/move/lang/parser/complete/attributes.txt
index 3e36c0e30..ba7abfed8 100644
--- a/src/test/resources/org/move/lang/parser/complete/attributes.txt
+++ b/src/test/resources/org/move/lang/parser/complete/attributes.txt
@@ -27,10 +27,11 @@ FILE
         PsiWhiteSpace('\n    ')
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x1')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x1')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('SomeOtherModule')
         PsiElement(;)(';')
@@ -121,10 +122,9 @@ FILE
               PsiWhiteSpace(' ')
               MvRefExprImpl(REF_EXPR)
                 MvPathImpl(PATH)
-                  MvFQModuleRefImpl(FQ_MODULE_REF)
-                    MvAddressRefImpl(ADDRESS_REF)
-                      MvNamedAddressImpl(NAMED_ADDRESS)
-                        PsiElement(IDENTIFIER)('std')
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      PsiElement(IDENTIFIER)('std')
                     PsiElement(::)('::')
                     PsiElement(IDENTIFIER)('type_name')
                   PsiElement(::)('::')
@@ -309,14 +309,26 @@ FILE
                   PsiWhiteSpace(' ')
                   MvRefExprImpl(REF_EXPR)
                     MvPathImpl(PATH)
-                      MvFQModuleRefImpl(FQ_MODULE_REF)
-                        MvAddressRefImpl(ADDRESS_REF)
-                          MvNamedAddressImpl(NAMED_ADDRESS)
-                            PsiElement(IDENTIFIER)('liquidswap')
+                      MvPathImpl(PATH)
+                        MvPathImpl(PATH)
+                          PsiElement(IDENTIFIER)('liquidswap')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('liquidity_pool')
                       PsiElement(::)('::')
                       PsiElement(IDENTIFIER)('ERR_ADMIN')
+              PsiElement(,)(',')
+              PsiWhiteSpace(' ')
+              MvAttrItemImpl(ATTR_ITEM)
+                PsiElement(IDENTIFIER)('location')
+                MvAttrItemInitializerImpl(ATTR_ITEM_INITIALIZER)
+                  PsiElement(=)('=')
+                  MvRefExprImpl(REF_EXPR)
+                    MvPathImpl(PATH)
+                      MvPathImpl(PATH)
+                        MvPathAddressImpl(PATH_ADDRESS)
+                          PsiElement(DIEM_ADDRESS)('0x1')
+                      PsiElement(::)('::')
+                      PsiElement(IDENTIFIER)('liquidity_pool')
               PsiElement())(')')
           PsiElement(])(']')
         PsiWhiteSpace('\n    ')
@@ -365,7 +377,7 @@ FILE
                   PsiWhiteSpace(' ')
                   MvRefExprImpl(REF_EXPR)
                     MvPathImpl(PATH)
-                      MvModuleRefImpl(MODULE_REF)
+                      MvPathImpl(PATH)
                         PsiElement(IDENTIFIER)('liquidity_pool')
                       PsiElement(::)('::')
                       PsiElement(IDENTIFIER)('ERR_ADMIN')
@@ -379,7 +391,7 @@ FILE
                   PsiWhiteSpace(' ')
                   MvRefExprImpl(REF_EXPR)
                     MvPathImpl(PATH)
-                      MvModuleRefImpl(MODULE_REF)
+                      MvPathImpl(PATH)
                         PsiElement(IDENTIFIER)('aptos_framework')
                       PsiElement(::)('::')
                       PsiElement(IDENTIFIER)('ed25519')
@@ -393,10 +405,9 @@ FILE
                   PsiWhiteSpace(' ')
                   MvRefExprImpl(REF_EXPR)
                     MvPathImpl(PATH)
-                      MvFQModuleRefImpl(FQ_MODULE_REF)
-                        MvAddressRefImpl(ADDRESS_REF)
-                          MvNamedAddressImpl(NAMED_ADDRESS)
-                            PsiElement(IDENTIFIER)('aptos_framework')
+                      MvPathImpl(PATH)
+                        MvPathImpl(PATH)
+                          PsiElement(IDENTIFIER)('aptos_framework')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('ed25519')
                       PsiElement(::)('::')
diff --git a/src/test/resources/org/move/lang/parser/complete/friend.txt b/src/test/resources/org/move/lang/parser/complete/friend.txt
index 5af7826aa..1645d1f47 100644
--- a/src/test/resources/org/move/lang/parser/complete/friend.txt
+++ b/src/test/resources/org/move/lang/parser/complete/friend.txt
@@ -10,9 +10,10 @@ FILE
       MvFriendDeclImpl(FRIEND_DECL)
         PsiElement(friend_kw)('friend')
         PsiWhiteSpace(' ')
-        MvFQModuleRefImpl(FQ_MODULE_REF)
-          MvAddressRefImpl(ADDRESS_REF)
-            PsiElement(DIEM_ADDRESS)('0x1')
+        MvPathImpl(PATH)
+          MvPathImpl(PATH)
+            MvPathAddressImpl(PATH_ADDRESS)
+              PsiElement(DIEM_ADDRESS)('0x1')
           PsiElement(::)('::')
           PsiElement(IDENTIFIER)('M2')
         PsiElement(;)(';')
@@ -27,9 +28,10 @@ FILE
         PsiWhiteSpace('\n    ')
         PsiElement(friend_kw)('friend')
         PsiWhiteSpace(' ')
-        MvFQModuleRefImpl(FQ_MODULE_REF)
-          MvAddressRefImpl(ADDRESS_REF)
-            PsiElement(DIEM_ADDRESS)('0x2')
+        MvPathImpl(PATH)
+          MvPathImpl(PATH)
+            MvPathAddressImpl(PATH_ADDRESS)
+              PsiElement(DIEM_ADDRESS)('0x2')
           PsiElement(::)('::')
           PsiElement(IDENTIFIER)('M2')
         PsiElement(;)(';')
@@ -73,4 +75,4 @@ FILE
           PsiElement({)('{')
           PsiElement(})('}')
       PsiWhiteSpace('\n')
-      PsiElement(})('}')
+      PsiElement(})('}')
\ No newline at end of file
diff --git a/src/test/resources/org/move/lang/parser/complete/function_calls.txt b/src/test/resources/org/move/lang/parser/complete/function_calls.txt
index 564e480a6..f34cb93e7 100644
--- a/src/test/resources/org/move/lang/parser/complete/function_calls.txt
+++ b/src/test/resources/org/move/lang/parser/complete/function_calls.txt
@@ -245,9 +245,10 @@ FILE
                   MvTypeArgumentImpl(TYPE_ARGUMENT)
                     MvPathTypeImpl(PATH_TYPE)
                       MvPathImpl(PATH)
-                        MvFQModuleRefImpl(FQ_MODULE_REF)
-                          MvAddressRefImpl(ADDRESS_REF)
-                            PsiElement(DIEM_ADDRESS)('0x1')
+                        MvPathImpl(PATH)
+                          MvPathImpl(PATH)
+                            MvPathAddressImpl(PATH_ADDRESS)
+                              PsiElement(DIEM_ADDRESS)('0x1')
                           PsiElement(::)('::')
                           PsiElement(IDENTIFIER)('Mod')
                         PsiElement(::)('::')
@@ -267,10 +268,9 @@ FILE
                   MvTypeArgumentImpl(TYPE_ARGUMENT)
                     MvPathTypeImpl(PATH_TYPE)
                       MvPathImpl(PATH)
-                        MvFQModuleRefImpl(FQ_MODULE_REF)
-                          MvAddressRefImpl(ADDRESS_REF)
-                            MvNamedAddressImpl(NAMED_ADDRESS)
-                              PsiElement(IDENTIFIER)('Sender')
+                        MvPathImpl(PATH)
+                          MvPathImpl(PATH)
+                            PsiElement(IDENTIFIER)('Sender')
                           PsiElement(::)('::')
                           PsiElement(IDENTIFIER)('Mod')
                         PsiElement(::)('::')
@@ -356,7 +356,7 @@ FILE
                 MvValueArgumentImpl(VALUE_ARGUMENT)
                   MvCallExprImpl(CALL_EXPR)
                     MvPathImpl(PATH)
-                      MvModuleRefImpl(MODULE_REF)
+                      MvPathImpl(PATH)
                         PsiElement(IDENTIFIER)('Transaction')
                       PsiElement(::)('::')
                       PsiElement(IDENTIFIER)('new')
@@ -383,7 +383,7 @@ FILE
           MvExprStmtImpl(EXPR_STMT)
             MvCallExprImpl(CALL_EXPR)
               MvPathImpl(PATH)
-                MvModuleRefImpl(MODULE_REF)
+                MvPathImpl(PATH)
                   PsiElement(IDENTIFIER)('Transaction')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('call')
diff --git a/src/test/resources/org/move/lang/parser/complete/function_declarations.txt b/src/test/resources/org/move/lang/parser/complete/function_declarations.txt
index 4d06fefac..5b00034ca 100644
--- a/src/test/resources/org/move/lang/parser/complete/function_declarations.txt
+++ b/src/test/resources/org/move/lang/parser/complete/function_declarations.txt
@@ -332,7 +332,7 @@ FILE
                   PsiElement(&)('&')
                 MvPathTypeImpl(PATH_TYPE)
                   MvPathImpl(PATH)
-                    MvModuleRefImpl(MODULE_REF)
+                    MvPathImpl(PATH)
                       PsiElement(IDENTIFIER)('Transaction')
                     PsiElement(::)('::')
                     PsiElement(IDENTIFIER)('Sender')
@@ -385,7 +385,7 @@ FILE
               PsiWhiteSpace(' ')
               MvPathTypeImpl(PATH_TYPE)
                 MvPathImpl(PATH)
-                  MvModuleRefImpl(MODULE_REF)
+                  MvPathImpl(PATH)
                     PsiElement(IDENTIFIER)('Transaction')
                   PsiElement(::)('::')
                   PsiElement(IDENTIFIER)('Sender')
@@ -395,9 +395,10 @@ FILE
           PsiWhiteSpace(' ')
           MvPathTypeImpl(PATH_TYPE)
             MvPathImpl(PATH)
-              MvFQModuleRefImpl(FQ_MODULE_REF)
-                MvAddressRefImpl(ADDRESS_REF)
-                  PsiElement(DIEM_ADDRESS)('0x1')
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathAddressImpl(PATH_ADDRESS)
+                    PsiElement(DIEM_ADDRESS)('0x1')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('Transaction')
               PsiElement(::)('::')
@@ -437,7 +438,7 @@ FILE
           PsiWhiteSpace(' ')
           MvPathTypeImpl(PATH_TYPE)
             MvPathImpl(PATH)
-              MvModuleRefImpl(MODULE_REF)
+              MvPathImpl(PATH)
                 PsiElement(IDENTIFIER)('Transaction')
               PsiElement(::)('::')
               PsiElement(IDENTIFIER)('Sender')
@@ -445,9 +446,10 @@ FILE
           PsiWhiteSpace(' ')
           MvPathTypeImpl(PATH_TYPE)
             MvPathImpl(PATH)
-              MvFQModuleRefImpl(FQ_MODULE_REF)
-                MvAddressRefImpl(ADDRESS_REF)
-                  PsiElement(DIEM_ADDRESS)('0x1')
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathAddressImpl(PATH_ADDRESS)
+                    PsiElement(DIEM_ADDRESS)('0x1')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('Transaction')
               PsiElement(::)('::')
@@ -456,10 +458,9 @@ FILE
           PsiWhiteSpace(' ')
           MvPathTypeImpl(PATH_TYPE)
             MvPathImpl(PATH)
-              MvFQModuleRefImpl(FQ_MODULE_REF)
-                MvAddressRefImpl(ADDRESS_REF)
-                  MvNamedAddressImpl(NAMED_ADDRESS)
-                    PsiElement(IDENTIFIER)('Std')
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  PsiElement(IDENTIFIER)('Std')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('Transaction')
               PsiElement(::)('::')
@@ -468,7 +469,7 @@ FILE
           PsiWhiteSpace(' ')
           MvPathTypeImpl(PATH_TYPE)
             MvPathImpl(PATH)
-              MvModuleRefImpl(MODULE_REF)
+              MvPathImpl(PATH)
                 PsiElement(IDENTIFIER)('Loans')
               PsiElement(::)('::')
               PsiElement(IDENTIFIER)('Loan')
@@ -678,4 +679,4 @@ FILE
               PsiElement(IDENTIFIER)('T')
         PsiElement(;)(';')
       PsiWhiteSpace('\n')
-      PsiElement(})('}')
+      PsiElement(})('}')
\ No newline at end of file
diff --git a/src/test/resources/org/move/lang/parser/complete/index_expr.txt b/src/test/resources/org/move/lang/parser/complete/index_expr.txt
index 30fff8a0e..6935a2ef5 100644
--- a/src/test/resources/org/move/lang/parser/complete/index_expr.txt
+++ b/src/test/resources/org/move/lang/parser/complete/index_expr.txt
@@ -363,10 +363,11 @@ FILE
           MvUseStmtImpl(USE_STMT)
             PsiElement(use)('use')
             PsiWhiteSpace(' ')
-            MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-              MvFQModuleRefImpl(FQ_MODULE_REF)
-                MvAddressRefImpl(ADDRESS_REF)
-                  PsiElement(DIEM_ADDRESS)('0x42')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathAddressImpl(PATH_ADDRESS)
+                    PsiElement(DIEM_ADDRESS)('0x42')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('test')
             PsiElement(;)(';')
@@ -388,7 +389,7 @@ FILE
                             MvIndexExprImpl(INDEX_EXPR)
                               MvRefExprImpl(REF_EXPR)
                                 MvPathImpl(PATH)
-                                  MvModuleRefImpl(MODULE_REF)
+                                  MvPathImpl(PATH)
                                     PsiElement(IDENTIFIER)('test')
                                   PsiElement(::)('::')
                                   PsiElement(IDENTIFIER)('Y')
@@ -486,9 +487,10 @@ FILE
                 MvIndexExprImpl(INDEX_EXPR)
                   MvRefExprImpl(REF_EXPR)
                     MvPathImpl(PATH)
-                      MvFQModuleRefImpl(FQ_MODULE_REF)
-                        MvAddressRefImpl(ADDRESS_REF)
-                          PsiElement(DIEM_ADDRESS)('0x42')
+                      MvPathImpl(PATH)
+                        MvPathImpl(PATH)
+                          MvPathAddressImpl(PATH_ADDRESS)
+                            PsiElement(DIEM_ADDRESS)('0x42')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('test')
                       PsiElement(::)('::')
@@ -700,9 +702,10 @@ FILE
                 MvIndexExprImpl(INDEX_EXPR)
                   MvRefExprImpl(REF_EXPR)
                     MvPathImpl(PATH)
-                      MvFQModuleRefImpl(FQ_MODULE_REF)
-                        MvAddressRefImpl(ADDRESS_REF)
-                          PsiElement(DIEM_ADDRESS)('0x42')
+                      MvPathImpl(PATH)
+                        MvPathImpl(PATH)
+                          MvPathAddressImpl(PATH_ADDRESS)
+                            PsiElement(DIEM_ADDRESS)('0x42')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('test')
                       PsiElement(::)('::')
diff --git a/src/test/resources/org/move/lang/parser/complete/paths.move b/src/test/resources/org/move/lang/parser/complete/paths.move
new file mode 100644
index 000000000..8d16094a3
--- /dev/null
+++ b/src/test/resources/org/move/lang/parser/complete/paths.move
@@ -0,0 +1,22 @@
+module 0x1::paths {
+    fun main() {
+        0x1;
+        0x1::m;
+        std::m;
+
+        0x1::m::call;
+        std::m::call;
+
+        0x1::m::Enum::EnumType;
+        std::m::Enum::EnumType;
+
+        std<>;
+        std<>::item;
+        std::m<>;
+        std::m<>::item;
+        std::m::call<>;
+        std::m::call<>::item;
+        std::m::Enum::EnumType<>;
+        std::m::Enum::EnumType<>::item;
+    }
+}
diff --git a/src/test/resources/org/move/lang/parser/complete/paths.txt b/src/test/resources/org/move/lang/parser/complete/paths.txt
new file mode 100644
index 000000000..937f6de0e
--- /dev/null
+++ b/src/test/resources/org/move/lang/parser/complete/paths.txt
@@ -0,0 +1,226 @@
+FILE
+  MvModuleImpl(MODULE)
+    PsiElement(module)('module')
+    PsiWhiteSpace(' ')
+    MvAddressRefImpl(ADDRESS_REF)
+      PsiElement(DIEM_ADDRESS)('0x1')
+    PsiElement(::)('::')
+    PsiElement(IDENTIFIER)('paths')
+    PsiWhiteSpace(' ')
+    MvModuleBlockImpl(MODULE_BLOCK)
+      PsiElement({)('{')
+      PsiWhiteSpace('\n    ')
+      MvFunctionImpl(FUNCTION)
+        PsiElement(fun)('fun')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('main')
+        MvFunctionParameterListImpl(FUNCTION_PARAMETER_LIST)
+          PsiElement(()('(')
+          PsiElement())(')')
+        PsiWhiteSpace(' ')
+        MvCodeBlockImpl(CODE_BLOCK)
+          PsiElement({)('{')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvLitExprImpl(LIT_EXPR)
+              PsiElement(HEX_INTEGER_LITERAL)('0x1')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathAddressImpl(PATH_ADDRESS)
+                    PsiElement(DIEM_ADDRESS)('0x1')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('m')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  PsiElement(IDENTIFIER)('std')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('m')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    MvPathAddressImpl(PATH_ADDRESS)
+                      PsiElement(DIEM_ADDRESS)('0x1')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('m')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('call')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    PsiElement(IDENTIFIER)('std')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('m')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('call')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      MvPathAddressImpl(PATH_ADDRESS)
+                        PsiElement(DIEM_ADDRESS)('0x1')
+                    PsiElement(::)('::')
+                    PsiElement(IDENTIFIER)('m')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('Enum')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('EnumType')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      PsiElement(IDENTIFIER)('std')
+                    PsiElement(::)('::')
+                    PsiElement(IDENTIFIER)('m')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('Enum')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('EnumType')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('std')
+                MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                  PsiElement(<)('<')
+                  PsiElement(>)('>')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  PsiElement(IDENTIFIER)('std')
+                  MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                    PsiElement(<)('<')
+                    PsiElement(>)('>')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('item')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  PsiElement(IDENTIFIER)('std')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('m')
+                MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                  PsiElement(<)('<')
+                  PsiElement(>)('>')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    PsiElement(IDENTIFIER)('std')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('m')
+                  MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                    PsiElement(<)('<')
+                    PsiElement(>)('>')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('item')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    PsiElement(IDENTIFIER)('std')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('m')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('call')
+                MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                  PsiElement(<)('<')
+                  PsiElement(>)('>')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      PsiElement(IDENTIFIER)('std')
+                    PsiElement(::)('::')
+                    PsiElement(IDENTIFIER)('m')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('call')
+                  MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                    PsiElement(<)('<')
+                    PsiElement(>)('>')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('item')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      PsiElement(IDENTIFIER)('std')
+                    PsiElement(::)('::')
+                    PsiElement(IDENTIFIER)('m')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('Enum')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('EnumType')
+                MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                  PsiElement(<)('<')
+                  PsiElement(>)('>')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      MvPathImpl(PATH)
+                        PsiElement(IDENTIFIER)('std')
+                      PsiElement(::)('::')
+                      PsiElement(IDENTIFIER)('m')
+                    PsiElement(::)('::')
+                    PsiElement(IDENTIFIER)('Enum')
+                  PsiElement(::)('::')
+                  PsiElement(IDENTIFIER)('EnumType')
+                  MvTypeArgumentListImpl(TYPE_ARGUMENT_LIST)
+                    PsiElement(<)('<')
+                    PsiElement(>)('>')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('item')
+            PsiElement(;)(';')
+          PsiWhiteSpace('\n    ')
+          PsiElement(})('}')
+      PsiWhiteSpace('\n')
+      PsiElement(})('}')
\ No newline at end of file
diff --git a/src/test/resources/org/move/lang/parser/complete/use.move b/src/test/resources/org/move/lang/parser/complete/use.move
index 6adaac68c..4283d196b 100644
--- a/src/test/resources/org/move/lang/parser/complete/use.move
+++ b/src/test/resources/org/move/lang/parser/complete/use.move
@@ -1,10 +1,14 @@
-script {
+module 0x1::m {
     use 0x1::Transaction;
     use 0x1::Transaction::Instance;
     use 0x1::Transaction::{};
     use 0x1::Transaction::{Self, EventHandle};
     use 0x1::Transaction::foo as bar;
-    use 0x1::Transaction::{foo, foo as bar};
+    use 0x1::Transaction::{foo, foo as bar, foo::Handle};
+
+    use liquidswap::Transaction::call;
+    use liquidswap::Transaction::call::Handle;
+    use liquidswap::Transaction::call::{Handle1, Handle2};
 
     fun main() {
         use 0x1::Transaction;
diff --git a/src/test/resources/org/move/lang/parser/complete/use.txt b/src/test/resources/org/move/lang/parser/complete/use.txt
index 58ade02be..100df47b2 100644
--- a/src/test/resources/org/move/lang/parser/complete/use.txt
+++ b/src/test/resources/org/move/lang/parser/complete/use.txt
@@ -1,17 +1,23 @@
 FILE
-  MvScriptImpl(SCRIPT)
-    PsiElement(script_kw)('script')
+  MvModuleImpl(MODULE)
+    PsiElement(module)('module')
     PsiWhiteSpace(' ')
-    MvScriptBlockImpl(SCRIPT_BLOCK)
+    MvAddressRefImpl(ADDRESS_REF)
+      PsiElement(DIEM_ADDRESS)('0x1')
+    PsiElement(::)('::')
+    PsiElement(IDENTIFIER)('m')
+    PsiWhiteSpace(' ')
+    MvModuleBlockImpl(MODULE_BLOCK)
       PsiElement({)('{')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x1')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x1')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
         PsiElement(;)(';')
@@ -19,28 +25,30 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x1')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x1')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemImpl(USE_ITEM)
             PsiElement(IDENTIFIER)('Instance')
         PsiElement(;)(';')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x1')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x1')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
           PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
+          MvUseGroupImpl(USE_GROUP)
             PsiElement({)('{')
             PsiElement(})('}')
         PsiElement(;)(';')
@@ -48,66 +56,138 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x1')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x1')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
           PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
+          MvUseGroupImpl(USE_GROUP)
             PsiElement({)('{')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('Self')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('Self')
             PsiElement(,)(',')
             PsiWhiteSpace(' ')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('EventHandle')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('EventHandle')
             PsiElement(})('}')
         PsiElement(;)(';')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x1')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x1')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemImpl(USE_ITEM)
             PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace(' ')
+          MvUseAliasImpl(USE_ALIAS)
+            PsiElement(as)('as')
             PsiWhiteSpace(' ')
-            MvUseAliasImpl(USE_ALIAS)
-              PsiElement(as)('as')
-              PsiWhiteSpace(' ')
-              PsiElement(IDENTIFIER)('bar')
+            PsiElement(IDENTIFIER)('bar')
         PsiElement(;)(';')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x1')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x1')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
           PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
+          MvUseGroupImpl(USE_GROUP)
             PsiElement({)('{')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('foo')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('foo')
             PsiElement(,)(',')
             PsiWhiteSpace(' ')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('foo')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('foo')
               PsiWhiteSpace(' ')
               MvUseAliasImpl(USE_ALIAS)
                 PsiElement(as)('as')
                 PsiWhiteSpace(' ')
                 PsiElement(IDENTIFIER)('bar')
+            PsiElement(,)(',')
+            PsiWhiteSpace(' ')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  PsiElement(IDENTIFIER)('foo')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('Handle')
+            PsiElement(})('}')
+        PsiElement(;)(';')
+      PsiWhiteSpace('\n\n    ')
+      MvUseStmtImpl(USE_STMT)
+        PsiElement(use)('use')
+        PsiWhiteSpace(' ')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('liquidswap')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
+            PsiElement(::)('::')
+            PsiElement(IDENTIFIER)('call')
+        PsiElement(;)(';')
+      PsiWhiteSpace('\n    ')
+      MvUseStmtImpl(USE_STMT)
+        PsiElement(use)('use')
+        PsiWhiteSpace(' ')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  PsiElement(IDENTIFIER)('liquidswap')
+                PsiElement(::)('::')
+                PsiElement(IDENTIFIER)('Transaction')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('call')
+            PsiElement(::)('::')
+            PsiElement(IDENTIFIER)('Handle')
+        PsiElement(;)(';')
+      PsiWhiteSpace('\n    ')
+      MvUseStmtImpl(USE_STMT)
+        PsiElement(use)('use')
+        PsiWhiteSpace(' ')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('liquidswap')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
+            PsiElement(::)('::')
+            PsiElement(IDENTIFIER)('call')
+          PsiElement(::)('::')
+          MvUseGroupImpl(USE_GROUP)
+            PsiElement({)('{')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('Handle1')
+            PsiElement(,)(',')
+            PsiWhiteSpace(' ')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('Handle2')
             PsiElement(})('}')
         PsiElement(;)(';')
       PsiWhiteSpace('\n\n    ')
@@ -125,10 +205,11 @@ FILE
           MvUseStmtImpl(USE_STMT)
             PsiElement(use)('use')
             PsiWhiteSpace(' ')
-            MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-              MvFQModuleRefImpl(FQ_MODULE_REF)
-                MvAddressRefImpl(ADDRESS_REF)
-                  PsiElement(DIEM_ADDRESS)('0x1')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathAddressImpl(PATH_ADDRESS)
+                    PsiElement(DIEM_ADDRESS)('0x1')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('Transaction')
             PsiElement(;)(';')
@@ -149,10 +230,11 @@ FILE
                   MvUseStmtImpl(USE_STMT)
                     PsiElement(use)('use')
                     PsiWhiteSpace(' ')
-                    MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-                      MvFQModuleRefImpl(FQ_MODULE_REF)
-                        MvAddressRefImpl(ADDRESS_REF)
-                          PsiElement(DIEM_ADDRESS)('0x1')
+                    MvUseSpeckImpl(USE_SPECK)
+                      MvPathImpl(PATH)
+                        MvPathImpl(PATH)
+                          MvPathAddressImpl(PATH_ADDRESS)
+                            PsiElement(DIEM_ADDRESS)('0x1')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('Transaction')
                     PsiElement(;)(';')
@@ -180,10 +262,11 @@ FILE
                             MvUseStmtImpl(USE_STMT)
                               PsiElement(use)('use')
                               PsiWhiteSpace(' ')
-                              MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-                                MvFQModuleRefImpl(FQ_MODULE_REF)
-                                  MvAddressRefImpl(ADDRESS_REF)
-                                    PsiElement(DIEM_ADDRESS)('0x2')
+                              MvUseSpeckImpl(USE_SPECK)
+                                MvPathImpl(PATH)
+                                  MvPathImpl(PATH)
+                                    MvPathAddressImpl(PATH_ADDRESS)
+                                      PsiElement(DIEM_ADDRESS)('0x2')
                                   PsiElement(::)('::')
                                   PsiElement(IDENTIFIER)('Mango')
                               PsiElement(;)(';')
@@ -210,10 +293,11 @@ FILE
                 MvUseStmtImpl(USE_STMT)
                   PsiElement(use)('use')
                   PsiWhiteSpace(' ')
-                  MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-                    MvFQModuleRefImpl(FQ_MODULE_REF)
-                      MvAddressRefImpl(ADDRESS_REF)
-                        PsiElement(DIEM_ADDRESS)('0x1')
+                  MvUseSpeckImpl(USE_SPECK)
+                    MvPathImpl(PATH)
+                      MvPathImpl(PATH)
+                        MvPathAddressImpl(PATH_ADDRESS)
+                          PsiElement(DIEM_ADDRESS)('0x1')
                       PsiElement(::)('::')
                       PsiElement(IDENTIFIER)('Transaction')
                   PsiElement(;)(';')
diff --git a/src/test/resources/org/move/lang/parser/complete/vectors.txt b/src/test/resources/org/move/lang/parser/complete/vectors.txt
index fcf92971d..37492c759 100644
--- a/src/test/resources/org/move/lang/parser/complete/vectors.txt
+++ b/src/test/resources/org/move/lang/parser/complete/vectors.txt
@@ -13,11 +13,10 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              MvNamedAddressImpl(NAMED_ADDRESS)
-                PsiElement(IDENTIFIER)('std')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              PsiElement(IDENTIFIER)('std')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('vector')
         PsiElement(;)(';')
@@ -117,7 +116,7 @@ FILE
           MvExprStmtImpl(EXPR_STMT)
             MvCallExprImpl(CALL_EXPR)
               MvPathImpl(PATH)
-                MvModuleRefImpl(MODULE_REF)
+                MvPathImpl(PATH)
                   PsiElement(IDENTIFIER)('vector')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('add')
@@ -128,4 +127,4 @@ FILE
           PsiWhiteSpace('\n    ')
           PsiElement(})('}')
       PsiWhiteSpace('\n')
-      PsiElement(})('}')
+      PsiElement(})('}')
\ No newline at end of file
diff --git a/src/test/resources/org/move/lang/parser/partial/dot_exprs.txt b/src/test/resources/org/move/lang/parser/partial/dot_exprs.txt
index 0f9c55ae5..bc6bcf186 100644
--- a/src/test/resources/org/move/lang/parser/partial/dot_exprs.txt
+++ b/src/test/resources/org/move/lang/parser/partial/dot_exprs.txt
@@ -124,7 +124,7 @@ FILE
           MvExprStmtImpl(EXPR_STMT)
             MvCallExprImpl(CALL_EXPR)
               MvPathImpl(PATH)
-                MvModuleRefImpl(MODULE_REF)
+                MvPathImpl(PATH)
                   PsiElement(IDENTIFIER)('aptos_token')
                 PsiElement(::)('::')
                 PsiElement(IDENTIFIER)('get_token')
diff --git a/src/test/resources/org/move/lang/parser/partial/expressions.move b/src/test/resources/org/move/lang/parser/partial/expressions.move
index 744d8e043..08f62be3c 100644
--- a/src/test/resources/org/move/lang/parser/partial/expressions.move
+++ b/src/test/resources/org/move/lang/parser/partial/expressions.move
@@ -15,5 +15,7 @@ script {
         while (true) {}
         return
         0hello
+
+        RMRK:: ::;
     }
 }
diff --git a/src/test/resources/org/move/lang/parser/partial/expressions.txt b/src/test/resources/org/move/lang/parser/partial/expressions.txt
index a551608be..466b8ff90 100644
--- a/src/test/resources/org/move/lang/parser/partial/expressions.txt
+++ b/src/test/resources/org/move/lang/parser/partial/expressions.txt
@@ -57,34 +57,35 @@ FILE
           MvExprStmtImpl(EXPR_STMT)
             MvRefExprImpl(REF_EXPR)
               MvPathImpl(PATH)
-                MvModuleRefImpl(MODULE_REF)
+                MvPathImpl(PATH)
                   PsiElement(IDENTIFIER)('RMRK')
                 PsiElement(::)('::')
-                PsiErrorElement:<type arguments>, IDENTIFIER or '{' expected, got '0x1'
+                PsiErrorElement:'::', <, <type arguments>, IDENTIFIER or '{' expected, got '0x1'
                   <empty list>
           PsiWhiteSpace('\n        ')
           MvExprStmtImpl(EXPR_STMT)
             MvRefExprImpl(REF_EXPR)
               MvPathImpl(PATH)
-                MvFQModuleRefImpl(FQ_MODULE_REF)
-                  MvAddressRefImpl(ADDRESS_REF)
+                MvPathImpl(PATH)
+                  MvPathAddressImpl(PATH_ADDRESS)
                     PsiElement(DIEM_ADDRESS)('0x1')
-                  PsiElement(::)('::')
-                  PsiErrorElement:'::', <type arguments>, IDENTIFIER or '{' expected, got ';'
-                    <empty list>
+                PsiElement(::)('::')
+                PsiErrorElement:'::', <, <type arguments>, IDENTIFIER or '{' expected, got ';'
+                  <empty list>
             PsiWhiteSpace(' ')
             PsiElement(;)(';')
           PsiWhiteSpace('\n        ')
           MvExprStmtImpl(EXPR_STMT)
             MvRefExprImpl(REF_EXPR)
               MvPathImpl(PATH)
-                MvFQModuleRefImpl(FQ_MODULE_REF)
-                  MvAddressRefImpl(ADDRESS_REF)
-                    PsiElement(DIEM_ADDRESS)('0x1')
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    MvPathAddressImpl(PATH_ADDRESS)
+                      PsiElement(DIEM_ADDRESS)('0x1')
                   PsiElement(::)('::')
                   PsiElement(IDENTIFIER)('RMRK')
                 PsiElement(::)('::')
-                PsiErrorElement:<type arguments>, IDENTIFIER or '{' expected, got ';'
+                PsiErrorElement:'::', <, <type arguments>, IDENTIFIER or '{' expected, got ';'
                   <empty list>
             PsiWhiteSpace(' ')
             PsiElement(;)(';')
@@ -92,14 +93,13 @@ FILE
           MvExprStmtImpl(EXPR_STMT)
             MvRefExprImpl(REF_EXPR)
               MvPathImpl(PATH)
-                MvFQModuleRefImpl(FQ_MODULE_REF)
-                  MvAddressRefImpl(ADDRESS_REF)
-                    MvNamedAddressImpl(NAMED_ADDRESS)
-                      PsiElement(IDENTIFIER)('Sender')
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    PsiElement(IDENTIFIER)('Sender')
                   PsiElement(::)('::')
                   PsiElement(IDENTIFIER)('RMRK')
                 PsiElement(::)('::')
-                PsiErrorElement:<type arguments>, IDENTIFIER or '{' expected, got ';'
+                PsiErrorElement:'::', <, <type arguments>, IDENTIFIER or '{' expected, got ';'
                   <empty list>
             PsiWhiteSpace(' ')
             PsiElement(;)(';')
@@ -107,14 +107,13 @@ FILE
           MvExprStmtImpl(EXPR_STMT)
             MvRefExprImpl(REF_EXPR)
               MvPathImpl(PATH)
-                MvFQModuleRefImpl(FQ_MODULE_REF)
-                  MvAddressRefImpl(ADDRESS_REF)
-                    MvNamedAddressImpl(NAMED_ADDRESS)
-                      PsiElement(IDENTIFIER)('Sender')
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    PsiElement(IDENTIFIER)('Sender')
                   PsiElement(::)('::')
                   PsiElement(IDENTIFIER)('RMRK')
                 PsiElement(::)('::')
-                PsiErrorElement:<type arguments>, IDENTIFIER or '{' expected, got 'while'
+                PsiErrorElement:'::', <, <type arguments>, IDENTIFIER or '{' expected, got 'while'
                   <empty list>
           PsiWhiteSpace('\n\n        ')
           MvExprStmtImpl(EXPR_STMT)
@@ -133,11 +132,29 @@ FILE
             PsiErrorElement:';' expected, got 'return'
               <empty list>
           PsiWhiteSpace('\n        ')
-          MvReturnExprImpl(RETURN_EXPR)
-            PsiElement(return)('return')
-            PsiWhiteSpace('\n        ')
-            MvLitExprImpl(LIT_EXPR)
-              PsiElement(INTEGER_LITERAL)('0hello')
+          MvExprStmtImpl(EXPR_STMT)
+            MvReturnExprImpl(RETURN_EXPR)
+              PsiElement(return)('return')
+              PsiWhiteSpace('\n        ')
+              MvLitExprImpl(LIT_EXPR)
+                PsiElement(INTEGER_LITERAL)('0hello')
+            PsiErrorElement:';' expected, got 'RMRK'
+              <empty list>
+          PsiWhiteSpace('\n\n        ')
+          MvExprStmtImpl(EXPR_STMT)
+            MvRefExprImpl(REF_EXPR)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathImpl(PATH)
+                    PsiElement(IDENTIFIER)('RMRK')
+                  PsiElement(::)('::')
+                  PsiErrorElement:'::', <, <type arguments> or IDENTIFIER expected, got '::'
+                    <empty list>
+                PsiWhiteSpace(' ')
+                PsiElement(::)('::')
+                PsiErrorElement:'::', <, <type arguments>, IDENTIFIER or '{' expected, got ';'
+                  <empty list>
+            PsiElement(;)(';')
           PsiWhiteSpace('\n    ')
           PsiElement(})('}')
       PsiWhiteSpace('\n')
diff --git a/src/test/resources/org/move/lang/parser/partial/module_uses.txt b/src/test/resources/org/move/lang/parser/partial/module_uses.txt
index b38731532..640a77f0a 100644
--- a/src/test/resources/org/move/lang/parser/partial/module_uses.txt
+++ b/src/test/resources/org/move/lang/parser/partial/module_uses.txt
@@ -12,211 +12,209 @@ FILE
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
-        PsiErrorElement:<address ref> or <qual path to module> expected, got 'use'
+        PsiErrorElement:<path> expected, got 'use'
           <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
-        PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvAddressRefImpl(ADDRESS_REF)
-            PsiElement(DIEM_ADDRESS)('0x0')
-        PsiErrorElement:'::' or ';' expected, got 'use'
-          <empty list>
+      PsiWhiteSpace(' ')
+      PsiElement(DIEM_ADDRESS)('0x0')
+      PsiErrorElement:'::' expected, got 'use'
+        <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvAddressRefImpl(ADDRESS_REF)
-            MvNamedAddressImpl(NAMED_ADDRESS)
-              PsiElement(IDENTIFIER)('Std')
-        PsiErrorElement:'::' or ';' expected, got 'use'
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            PsiElement(IDENTIFIER)('Std')
+        PsiErrorElement:'::', ';', <type arguments> or as expected, got 'use'
           <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              MvNamedAddressImpl(NAMED_ADDRESS)
-                PsiElement(IDENTIFIER)('Std')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              PsiElement(IDENTIFIER)('Std')
             PsiElement(::)('::')
-            PsiErrorElement:'::' or IDENTIFIER expected, got 'use'
+            PsiErrorElement:< or IDENTIFIER expected, got 'use'
               <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
-            PsiErrorElement:'::' or IDENTIFIER expected, got 'use'
+            PsiErrorElement:< or IDENTIFIER expected, got 'use'
               <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
-        PsiErrorElement:'::', ';' or as expected, got 'use'
+        PsiErrorElement:'::', ';', <type arguments> or as expected, got 'use'
           <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          PsiErrorElement:<item name> or '{' expected, got 'use'
-            <empty list>
+            PsiErrorElement:< or IDENTIFIER expected, got 'use'
+              <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          PsiErrorElement:<item name> or '{' expected, got ';'
-            <empty list>
+            PsiErrorElement:< or IDENTIFIER expected, got ';'
+              <empty list>
         PsiElement(;)(';')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemImpl(USE_ITEM)
             PsiElement(IDENTIFIER)('create')
-        PsiErrorElement:';' or as expected, got 'use'
+        PsiErrorElement:'::', ';', <type arguments> or as expected, got 'use'
           <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
           PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
+          MvUseGroupImpl(USE_GROUP)
             PsiElement({)('{')
-            PsiErrorElement:<item name> expected, got 'use'
+            PsiErrorElement:<path> expected, got 'use'
               <empty list>
-      PsiWhiteSpace('\n    ')
-      MvUseStmtImpl(USE_STMT)
-        PsiElement(use)('use')
-        PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
-            PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
-            PsiElement({)('{')
-            PsiErrorElement:'}' expected, got ';'
-              <empty list>
-        PsiElement(;)(';')
-      PsiWhiteSpace('\n    ')
-      MvUseStmtImpl(USE_STMT)
-        PsiElement(use)('use')
-        PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
-            PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
-            PsiElement({)('{')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('create')
-            PsiElement(,)(',')
-            PsiErrorElement:<item name> expected, got 'use'
+            PsiWhiteSpace('\n    ')
+            PsiElement(use)('use')
+            PsiWhiteSpace(' ')
+            PsiElement(DIEM_ADDRESS)('0x0')
+            PsiErrorElement:<path> expected, got '::'
               <empty list>
+      PsiElement(::)('::')
+      PsiElement(IDENTIFIER)('Transaction')
+      PsiElement(::)('::')
+      PsiElement({)('{')
+      PsiElement(;)(';')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
           PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
+          MvUseGroupImpl(USE_GROUP)
             PsiElement({)('{')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('create')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('create')
             PsiElement(,)(',')
-            PsiErrorElement:'}' expected, got ';'
+            PsiWhiteSpace('\n    ')
+            PsiErrorElement:'use' unexpected
+              PsiElement(use)('use')
+            PsiWhiteSpace(' ')
+            PsiElement(DIEM_ADDRESS)('0x0')
+            PsiErrorElement:<path> expected, got '::'
               <empty list>
-        PsiElement(;)(';')
+      PsiElement(::)('::')
+      PsiElement(IDENTIFIER)('Transaction')
+      PsiElement(::)('::')
+      PsiElement({)('{')
+      PsiElement(IDENTIFIER)('create')
+      PsiElement(,)(',')
+      PsiElement(;)(';')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
           PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
+          MvUseGroupImpl(USE_GROUP)
             PsiElement({)('{')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('create')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('create')
             PsiElement(,)(',')
             PsiWhiteSpace(' ')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('modify')
-            PsiElement(,)(',')
-            PsiErrorElement:<item name> expected, got ','
-              <empty list>
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('modify')
             PsiElement(,)(',')
+            PsiErrorElement:',' unexpected
+              PsiElement(,)(',')
             PsiElement(})('}')
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
             PsiElement(IDENTIFIER)('Transaction')
           PsiElement(::)('::')
-          MvUseItemGroupImpl(USE_ITEM_GROUP)
+          MvUseGroupImpl(USE_GROUP)
             PsiElement({)('{')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('create')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('create')
               PsiWhiteSpace(' ')
               MvUseAliasImpl(USE_ALIAS)
                 PsiElement(as)('as')
@@ -225,8 +223,9 @@ FILE
             PsiWhiteSpace(' ')
             PsiElement(,)(',')
             PsiWhiteSpace(' ')
-            MvUseItemImpl(USE_ITEM)
-              PsiElement(IDENTIFIER)('update')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                PsiElement(IDENTIFIER)('update')
             PsiElement(})('}')
         PsiElement(;)(';')
       PsiWhiteSpace('\n\n    ')
@@ -242,4 +241,4 @@ FILE
           PsiElement({)('{')
           PsiElement(})('}')
       PsiWhiteSpace('\n')
-      PsiElement(})('}')
+      PsiElement(})('}')
\ No newline at end of file
diff --git a/src/test/resources/org/move/lang/parser/partial/top_level_items.txt b/src/test/resources/org/move/lang/parser/partial/top_level_items.txt
index b29aa8325..e9ed5c874 100644
--- a/src/test/resources/org/move/lang/parser/partial/top_level_items.txt
+++ b/src/test/resources/org/move/lang/parser/partial/top_level_items.txt
@@ -53,7 +53,7 @@ FILE
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
-        PsiErrorElement:<address ref> or <qual path to module> expected, got 'fun'
+        PsiErrorElement:<path> expected, got 'fun'
           <empty list>
       PsiWhiteSpace('\n    ')
       MvFunctionImpl(FUNCTION)
@@ -79,12 +79,13 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
-            PsiErrorElement:'::' or IDENTIFIER expected, got '}'
+            PsiErrorElement:< or IDENTIFIER expected, got '}'
               <empty list>
       PsiWhiteSpace('\n')
       PsiElement(})('}')
@@ -98,12 +99,13 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathAddressImpl(PATH_ADDRESS)
+                PsiElement(DIEM_ADDRESS)('0x0')
             PsiElement(::)('::')
-            PsiErrorElement:'::' or IDENTIFIER expected, got 'fun'
+            PsiErrorElement:< or IDENTIFIER expected, got 'fun'
               <empty list>
       PsiWhiteSpace('\n\n    ')
       MvFunctionImpl(FUNCTION)
@@ -120,12 +122,13 @@ FILE
           MvUseStmtImpl(USE_STMT)
             PsiElement(use)('use')
             PsiWhiteSpace(' ')
-            MvModuleUseSpeckImpl(MODULE_USE_SPECK)
-              MvFQModuleRefImpl(FQ_MODULE_REF)
-                MvAddressRefImpl(ADDRESS_REF)
-                  PsiElement(DIEM_ADDRESS)('0x0')
+            MvUseSpeckImpl(USE_SPECK)
+              MvPathImpl(PATH)
+                MvPathImpl(PATH)
+                  MvPathAddressImpl(PATH_ADDRESS)
+                    PsiElement(DIEM_ADDRESS)('0x0')
                 PsiElement(::)('::')
-                PsiErrorElement:'::' or IDENTIFIER expected, got '}'
+                PsiErrorElement:< or IDENTIFIER expected, got '}'
                   <empty list>
           PsiWhiteSpace('\n    ')
           PsiElement(})('}')
@@ -141,15 +144,17 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          PsiErrorElement:<item name> or '{' expected, got 'fun'
-            <empty list>
+            PsiErrorElement:< or IDENTIFIER expected, got 'fun'
+              <empty list>
       PsiWhiteSpace('\n\n    ')
       MvFunctionImpl(FUNCTION)
         PsiElement(fun)('fun')
@@ -174,16 +179,17 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemImpl(USE_ITEM)
             PsiElement(IDENTIFIER)('create')
-        PsiErrorElement:';' or as expected, got 'fun'
+        PsiErrorElement:'::', ';', <type arguments> or as expected, got 'fun'
           <empty list>
       PsiWhiteSpace('\n\n    ')
       MvFunctionImpl(FUNCTION)
@@ -209,15 +215,17 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          PsiErrorElement:<item name> or '{' expected, got ';'
-            <empty list>
+            PsiErrorElement:< or IDENTIFIER expected, got ';'
+              <empty list>
         PsiElement(;)(';')
       PsiWhiteSpace('\n\n    ')
       MvFunctionImpl(FUNCTION)
@@ -243,29 +251,31 @@ FILE
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemImpl(USE_ITEM)
             PsiElement(IDENTIFIER)('create')
-        PsiErrorElement:';' or as expected, got 'use'
+        PsiErrorElement:'::', ';', <type arguments> or as expected, got 'use'
           <empty list>
       PsiWhiteSpace('\n    ')
       MvUseStmtImpl(USE_STMT)
         PsiElement(use)('use')
         PsiWhiteSpace(' ')
-        MvItemUseSpeckImpl(ITEM_USE_SPECK)
-          MvFQModuleRefImpl(FQ_MODULE_REF)
-            MvAddressRefImpl(ADDRESS_REF)
-              PsiElement(DIEM_ADDRESS)('0x0')
+        MvUseSpeckImpl(USE_SPECK)
+          MvPathImpl(PATH)
+            MvPathImpl(PATH)
+              MvPathImpl(PATH)
+                MvPathAddressImpl(PATH_ADDRESS)
+                  PsiElement(DIEM_ADDRESS)('0x0')
+              PsiElement(::)('::')
+              PsiElement(IDENTIFIER)('Transaction')
             PsiElement(::)('::')
-            PsiElement(IDENTIFIER)('Transaction')
-          PsiElement(::)('::')
-          MvUseItemImpl(USE_ITEM)
             PsiElement(IDENTIFIER)('modify')
         PsiElement(;)(';')
       PsiWhiteSpace('\n\n    ')
@@ -283,4 +293,4 @@ FILE
       PsiWhiteSpace('\n')
       PsiElement(})('}')
   PsiWhiteSpace('\n\n')
-  PsiComment(BLOCK_COMMENT)('/*')
+  PsiComment(BLOCK_COMMENT)('/*')
\ No newline at end of file
diff --git a/src/test/resources/org/move/lang/parser/specs/conditions.txt b/src/test/resources/org/move/lang/parser/specs/conditions.txt
index df84f53f6..9c7962f1c 100644
--- a/src/test/resources/org/move/lang/parser/specs/conditions.txt
+++ b/src/test/resources/org/move/lang/parser/specs/conditions.txt
@@ -417,7 +417,7 @@ FILE
                 PsiWhiteSpace(' ')
                 MvRefExprImpl(REF_EXPR)
                   MvPathImpl(PATH)
-                    MvModuleRefImpl(MODULE_REF)
+                    MvPathImpl(PATH)
                       PsiElement(IDENTIFIER)('Error')
                     PsiElement(::)('::')
                     PsiElement(IDENTIFIER)('MY_ERROR')
@@ -723,7 +723,7 @@ FILE
               MvBinaryExprImpl(BINARY_EXPR[==])
                 MvRefExprImpl(REF_EXPR)
                   MvPathImpl(PATH)
-                    MvModuleRefImpl(MODULE_REF)
+                    MvPathImpl(PATH)
                       PsiElement(IDENTIFIER)('Self')
                     PsiElement(::)('::')
                     PsiElement(IDENTIFIER)('generic')
diff --git a/src/test/resources/org/move/lang/parser/specs/pragma.txt b/src/test/resources/org/move/lang/parser/specs/pragma.txt
index eebc4e82f..e50b2c66e 100644
--- a/src/test/resources/org/move/lang/parser/specs/pragma.txt
+++ b/src/test/resources/org/move/lang/parser/specs/pragma.txt
@@ -94,9 +94,10 @@ FILE
               PsiWhiteSpace(' ')
               MvRefExprImpl(REF_EXPR)
                 MvPathImpl(PATH)
-                  MvFQModuleRefImpl(FQ_MODULE_REF)
-                    MvAddressRefImpl(ADDRESS_REF)
-                      PsiElement(DIEM_ADDRESS)('0x1')
+                  MvPathImpl(PATH)
+                    MvPathImpl(PATH)
+                      MvPathAddressImpl(PATH_ADDRESS)
+                        PsiElement(DIEM_ADDRESS)('0x1')
                     PsiElement(::)('::')
                     PsiElement(IDENTIFIER)('m')
                   PsiElement(::)('::')
diff --git a/src/test/resources/org/move/lang/parser/specs/spec_file.txt b/src/test/resources/org/move/lang/parser/specs/spec_file.txt
index 652d032c3..0134eb78e 100644
--- a/src/test/resources/org/move/lang/parser/specs/spec_file.txt
+++ b/src/test/resources/org/move/lang/parser/specs/spec_file.txt
@@ -2,10 +2,9 @@ FILE
   MvModuleSpecImpl(MODULE_SPEC)
     PsiElement(spec)('spec')
     PsiWhiteSpace(' ')
-    MvFQModuleRefImpl(FQ_MODULE_REF)
-      MvAddressRefImpl(ADDRESS_REF)
-        MvNamedAddressImpl(NAMED_ADDRESS)
-          PsiElement(IDENTIFIER)('sender')
+    MvPathImpl(PATH)
+      MvPathImpl(PATH)
+        PsiElement(IDENTIFIER)('sender')
       PsiElement(::)('::')
       PsiElement(IDENTIFIER)('my_module')
     PsiWhiteSpace(' ')
@@ -76,9 +75,9 @@ FILE
           PsiWhiteSpace('\n    ')
           PsiElement(})('}')
       PsiWhiteSpace('\n\n    ')
-      PsiComment(EOL_DOC_COMMENT)('/// Helper schema to specify that a function aborts if not in genesis.')
-      PsiWhiteSpace('\n    ')
       MvSchemaImpl(SCHEMA)
+        PsiComment(EOL_DOC_COMMENT)('/// Helper schema to specify that a function aborts if not in genesis.')
+        PsiWhiteSpace('\n    ')
         PsiElement(spec)('spec')
         PsiWhiteSpace(' ')
         PsiElement(schema_kw)('schema')
@@ -106,7 +105,7 @@ FILE
                 PsiWhiteSpace(' ')
                 MvRefExprImpl(REF_EXPR)
                   MvPathImpl(PATH)
-                    MvModuleRefImpl(MODULE_REF)
+                    MvPathImpl(PATH)
                       PsiElement(IDENTIFIER)('error')
                     PsiElement(::)('::')
                     PsiElement(IDENTIFIER)('INVALID_STATE')
diff --git a/src/test/resources/org/move/lang/parser/specs/spec_statements.txt b/src/test/resources/org/move/lang/parser/specs/spec_statements.txt
index 6cd89f60a..8486c183f 100644
--- a/src/test/resources/org/move/lang/parser/specs/spec_statements.txt
+++ b/src/test/resources/org/move/lang/parser/specs/spec_statements.txt
@@ -260,7 +260,7 @@ FILE
                   MvValueArgumentImpl(VALUE_ARGUMENT)
                     MvCallExprImpl(CALL_EXPR)
                       MvPathImpl(PATH)
-                        MvModuleRefImpl(MODULE_REF)
+                        MvPathImpl(PATH)
                           PsiElement(IDENTIFIER)('Signer')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('spec_address_of')
@@ -293,7 +293,7 @@ FILE
                   MvValueArgumentImpl(VALUE_ARGUMENT)
                     MvCallExprImpl(CALL_EXPR)
                       MvPathImpl(PATH)
-                        MvModuleRefImpl(MODULE_REF)
+                        MvPathImpl(PATH)
                           PsiElement(IDENTIFIER)('Signer')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('spec_address_of')
@@ -336,7 +336,7 @@ FILE
               PsiWhiteSpace(' ')
               MvRefExprImpl(REF_EXPR)
                 MvPathImpl(PATH)
-                  MvModuleRefImpl(MODULE_REF)
+                  MvPathImpl(PATH)
                     PsiElement(IDENTIFIER)('Errors')
                   PsiElement(::)('::')
                   PsiElement(IDENTIFIER)('NOT_PUBLISHED')
@@ -493,7 +493,7 @@ FILE
                     PsiWhiteSpace(' ')
                     MvCallExprImpl(CALL_EXPR)
                       MvPathImpl(PATH)
-                        MvModuleRefImpl(MODULE_REF)
+                        MvPathImpl(PATH)
                           PsiElement(IDENTIFIER)('Signer')
                         PsiElement(::)('::')
                         PsiElement(IDENTIFIER)('address_of')