From dd1fe03ff3089b416853c2c2cd65cde59585e79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Giraud?= <giraud.contact@yahoo.fr>
Date: Tue, 18 Feb 2020 09:42:30 +0100
Subject: [PATCH] #167 add parsing for deconstruction let [193]

---
 jps-plugin/src/com/reason/Log.java            |  6 +-
 .../lang/core/psi/PsiQualifiedElement.java    | 12 ++++
 .../ide/docs/DocumentationProvider.java       | 14 ++---
 src/com/reason/ide/files/FileBase.java        |  8 ++-
 .../reason/ide/go/ORModuleContributor.java    |  6 +-
 .../FreeExpressionCompletionProvider.java     | 38 ++++++-------
 .../provider/ModuleCompletionProvider.java    |  5 +-
 .../provider/ObjectCompletionProvider.java    | 27 ++++-----
 .../intentions/ExpandLocalOpenIntention.java  |  4 +-
 .../intentions/FunctionBracesIntention.java   |  8 +--
 src/com/reason/ide/search/PsiFinder.java      | 28 ++++-----
 .../ide/search/RmlFindUsagesProvider.java     | 22 +++----
 .../ide/search/index/ExceptionFqnIndex.java   |  2 +-
 .../ide/search/index/ExceptionIndex.java      |  2 +-
 .../ide/search/index/ExternalIndex.java       |  2 +-
 .../reason/ide/search/index/LetFqnIndex.java  |  2 +-
 src/com/reason/ide/search/index/LetIndex.java |  2 +-
 .../search/index/ModuleComponentIndex.java    |  2 +-
 .../ide/search/index/ModuleFqnIndex.java      |  2 +-
 .../reason/ide/search/index/ModuleIndex.java  |  2 +-
 .../ide/search/index/RecordFieldIndex.java    |  4 +-
 .../reason/ide/search/index/TypeIndex.java    |  2 +-
 .../reason/ide/search/index/ValFqnIndex.java  |  2 +-
 src/com/reason/ide/search/index/ValIndex.java |  2 +-
 .../ide/search/index/VariantFqnIndex.java     |  2 +-
 .../reason/ide/search/index/VariantIndex.java |  5 +-
 src/com/reason/lang/ParserScopeEnum.java      |  3 +-
 ...ElementFactory.java => ORCodeFactory.java} |  8 +--
 src/com/reason/lang/core/ORUtil.java          | 15 +++--
 .../reason/lang/core/PsiElementFactory.java   |  2 +
 src/com/reason/lang/core/psi/PsiClass.java    | 10 ++--
 .../lang/core/psi/PsiDeconstruction.java      | 29 ++++++++++
 .../reason/lang/core/psi/PsiException.java    |  4 +-
 src/com/reason/lang/core/psi/PsiExternal.java |  6 +-
 .../reason/lang/core/psi/PsiFakeModule.java   |  8 ++-
 src/com/reason/lang/core/psi/PsiFunctor.java  | 10 ++--
 src/com/reason/lang/core/psi/PsiLet.java      | 22 ++++---
 src/com/reason/lang/core/psi/PsiModule.java   |  3 +-
 .../reason/lang/core/psi/PsiParameter.java    |  7 +--
 .../lang/core/psi/PsiQualifiedElement.java    |  9 ---
 .../reason/lang/core/psi/PsiRecordField.java  |  7 +--
 src/com/reason/lang/core/psi/PsiType.java     | 12 ++--
 src/com/reason/lang/core/psi/PsiVal.java      |  4 +-
 .../lang/core/psi/PsiVariantDeclaration.java  | 26 ++++++---
 .../lang/core/psi/impl/PsiClassImpl.java      | 13 ++++-
 .../lang/core/psi/impl/PsiExceptionImpl.java  | 23 ++++++--
 .../lang/core/psi/impl/PsiExternalImpl.java   | 14 ++++-
 .../lang/core/psi/impl/PsiFunctorImpl.java    | 34 ++++++-----
 .../lang/core/psi/impl/PsiIncludeImpl.java    | 39 ++++++-------
 .../core/psi/impl/PsiInnerModuleImpl.java     | 44 ++++++--------
 .../reason/lang/core/psi/impl/PsiLetImpl.java | 20 ++++++-
 .../core/psi/impl/PsiLowerSymbolImpl.java     |  4 +-
 .../lang/core/psi/impl/PsiOpenImpl.java       | 41 ++++++-------
 .../lang/core/psi/impl/PsiParameterImpl.java  | 27 ++++-----
 .../core/psi/impl/PsiRecordFieldImpl.java     | 26 +++++----
 .../lang/core/psi/impl/PsiTypeImpl.java       | 13 ++++-
 .../core/psi/impl/PsiUpperSymbolImpl.java     |  4 +-
 .../reason/lang/core/psi/impl/PsiValImpl.java | 24 +++++---
 .../psi/reference/ORFakeResolvedElement.java  |  2 +-
 .../reference/PsiLowerSymbolReference.java    | 57 ++++++++++++++-----
 .../reference/PsiUpperSymbolReference.java    | 20 +++----
 .../lang/core/stub/PsiExceptionStub.java      | 16 ++++--
 .../lang/core/stub/PsiExternalStub.java       | 15 +++--
 src/com/reason/lang/core/stub/PsiLetStub.java | 15 ++++-
 .../reason/lang/core/stub/PsiModuleStub.java  | 17 ++++--
 .../lang/core/stub/PsiRecordFieldStub.java    | 17 ++++--
 .../reason/lang/core/stub/PsiTypeStub.java    | 15 +++--
 src/com/reason/lang/core/stub/PsiValStub.java | 21 ++++---
 .../core/stub/PsiVariantDeclarationStub.java  | 16 ++++--
 .../type/PsiExceptionStubElementType.java     |  8 +--
 .../stub/type/PsiExternalStubElementType.java |  8 +--
 .../type/PsiFakeModuleStubElementType.java    |  2 +-
 .../core/stub/type/PsiLetStubElementType.java | 46 +++++++++++++--
 .../stub/type/PsiModuleStubElementType.java   |  8 +--
 .../type/PsiRecordFieldStubElementType.java   | 19 ++++---
 .../stub/type/PsiTypeStubElementType.java     |  8 +--
 .../core/stub/type/PsiValStubElementType.java |  8 +--
 .../stub/type/PsiVariantStubElementType.java  |  8 +--
 src/com/reason/lang/core/type/ORTypes.java    |  1 +
 src/com/reason/lang/ocaml/OclParser.java      | 18 +++++-
 src/com/reason/lang/ocaml/OclQNameFinder.java |  3 +-
 src/com/reason/lang/ocaml/OclTypes.java       |  1 +
 src/com/reason/lang/reason/RmlParser.java     | 20 +++++--
 .../reason/lang/reason/RmlQNameFinder.java    |  3 +-
 src/com/reason/lang/reason/RmlTypes.java      |  1 +
 tests/com/reason/ide/PsiFinderTest.java       | 30 ++++++++--
 .../ide/completion/FreeCompletionTest.java    |  9 +++
 .../ide/reference/OclQNameFinderTest.java     | 15 +++++
 .../reference/ResolveExternalElementTest.java | 10 ++--
 .../ide/reference/ResolveLetElementTest.java  | 33 +++++------
 .../reference/ResolveModuleElementTest.java   | 41 +++++++------
 .../reference/ResolveRecordFieldsTest.java    | 13 ++---
 .../ide/reference/ResolveTypeElementTest.java | 24 ++++----
 .../reference/ResolveVariantElementTest.java  | 11 ++--
 .../ide/reference/RmlQNameFinderTest.java     | 17 ++++++
 tests/com/reason/lang/core/ORUtilTest.java    | 41 +++++++++++++
 .../reason/lang/core/PsiScopedExprTest.java   |  3 +-
 tests/com/reason/lang/core/PsiUtilTest.java   | 30 ----------
 .../com/reason/lang/ocaml/LetParsingTest.java | 11 ++++
 .../reason/lang/reason/LetParsingTest.java    | 15 +++--
 100 files changed, 861 insertions(+), 537 deletions(-)
 create mode 100644 jps-plugin/src/com/reason/lang/core/psi/PsiQualifiedElement.java
 rename src/com/reason/lang/core/{ORElementFactory.java => ORCodeFactory.java} (97%)
 create mode 100644 src/com/reason/lang/core/psi/PsiDeconstruction.java
 delete mode 100644 src/com/reason/lang/core/psi/PsiQualifiedElement.java
 create mode 100644 tests/com/reason/ide/reference/OclQNameFinderTest.java
 create mode 100644 tests/com/reason/ide/reference/RmlQNameFinderTest.java
 create mode 100644 tests/com/reason/lang/core/ORUtilTest.java
 delete mode 100644 tests/com/reason/lang/core/PsiUtilTest.java

diff --git a/jps-plugin/src/com/reason/Log.java b/jps-plugin/src/com/reason/Log.java
index 4d418c5dc..8049d8b74 100644
--- a/jps-plugin/src/com/reason/Log.java
+++ b/jps-plugin/src/com/reason/Log.java
@@ -8,8 +8,8 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.ResolveResult;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 
 public class Log {
 
@@ -130,13 +130,13 @@ public void trace(String comment, @Nullable Collection<?> t) {
         }
     }
 
-    public void debug(String comment, @NotNull PsiQualifiedNamedElement element) {
+    public void debug(String comment, @NotNull PsiQualifiedElement element) {
         if (m_log.isDebugEnabled()) {
             m_log.debug(comment + SEP + element.getQualifiedName() + " (" + element.getContainingFile().getVirtualFile().getPath() + ")");
         }
     }
 
-    public void debug(String comment, @NotNull PsiQualifiedNamedElement element, int position) {
+    public void debug(String comment, @NotNull PsiQualifiedElement element, int position) {
         if (m_log.isDebugEnabled()) {
             m_log.debug(comment + SEP + element.getQualifiedName() + " (" + element.getContainingFile().getVirtualFile().getPath() + ") pos=" + position);
         }
diff --git a/jps-plugin/src/com/reason/lang/core/psi/PsiQualifiedElement.java b/jps-plugin/src/com/reason/lang/core/psi/PsiQualifiedElement.java
new file mode 100644
index 000000000..aaaa037b4
--- /dev/null
+++ b/jps-plugin/src/com/reason/lang/core/psi/PsiQualifiedElement.java
@@ -0,0 +1,12 @@
+package com.reason.lang.core.psi;
+
+import org.jetbrains.annotations.NotNull;
+import com.intellij.psi.PsiNamedElement;
+
+public interface PsiQualifiedElement extends PsiNamedElement {
+    @NotNull
+    String getPath();
+
+    @NotNull
+    String getQualifiedName();
+}
diff --git a/src/com/reason/ide/docs/DocumentationProvider.java b/src/com/reason/ide/docs/DocumentationProvider.java
index eca064034..b3193a9fe 100644
--- a/src/com/reason/ide/docs/DocumentationProvider.java
+++ b/src/com/reason/ide/docs/DocumentationProvider.java
@@ -10,8 +10,6 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -26,6 +24,7 @@
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiLowerSymbol;
 import com.reason.lang.core.psi.PsiModule;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 import com.reason.lang.core.psi.PsiSignatureElement;
 import com.reason.lang.core.psi.PsiType;
 import com.reason.lang.core.psi.PsiTypeConstrName;
@@ -183,20 +182,19 @@ public String getQuickNavigateInfo(@NotNull PsiElement element, @NotNull PsiElem
                 ORSignature signature = ((PsiSignatureElement) resolvedElement).getORSignature();
                 if (!signature.isEmpty()) {
                     String sig = DocFormatter.escapeCodeForHtml(signature.asString(originalElement.getLanguage()));
-                    if (resolvedElement instanceof PsiQualifiedNamedElement) {
-                        String path = ORUtil.getQualifiedPath((PsiNameIdentifierOwner) resolvedElement);
+                    if (resolvedElement instanceof PsiQualifiedElement) {
+                        PsiQualifiedElement qualifiedElement = (PsiQualifiedElement) resolvedElement;
                         String elementType = PsiTypeElementProvider.getType(resolvedElement);
-                        String desc = ((PsiNamedElement) resolvedElement).getName();
-                        return createQuickDocTemplate(path, elementType, desc, sig);
+                        return createQuickDocTemplate(qualifiedElement.getPath(), elementType, qualifiedElement.getName(), sig);
                     }
                     return sig;
                 }
             }
 
             // No signature found, but resolved
-            if (resolvedElement instanceof PsiQualifiedNamedElement) {
+            if (resolvedElement instanceof PsiNameIdentifierOwner) {
                 String elementType = PsiTypeElementProvider.getType(resolvedElement);
-                String desc = ((PsiQualifiedNamedElement) resolvedElement).getName();
+                String desc = ((PsiNameIdentifierOwner) resolvedElement).getName();
                 String path = ORUtil.getQualifiedPath((PsiNameIdentifierOwner) resolvedElement);
 
                 if (inferredType == null) {
diff --git a/src/com/reason/ide/files/FileBase.java b/src/com/reason/ide/files/FileBase.java
index 0932bb921..850525b8b 100644
--- a/src/com/reason/ide/files/FileBase.java
+++ b/src/com/reason/ide/files/FileBase.java
@@ -130,7 +130,13 @@ public PsiType getTypeExpression(@Nullable String name) {
         return expressions.isEmpty() ? null : expressions.iterator().next();
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        return getModuleName();
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         return getModuleName();
diff --git a/src/com/reason/ide/go/ORModuleContributor.java b/src/com/reason/ide/go/ORModuleContributor.java
index 9b09945ef..5ad316082 100644
--- a/src/com/reason/ide/go/ORModuleContributor.java
+++ b/src/com/reason/ide/go/ORModuleContributor.java
@@ -6,7 +6,6 @@
 import com.intellij.navigation.GotoClassContributor;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Processor;
 import com.intellij.util.indexing.FindSymbolParameters;
@@ -16,6 +15,7 @@
 import com.reason.ide.search.index.ModuleIndex;
 import com.reason.lang.core.ORFileType;
 import com.reason.lang.core.psi.PsiModule;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 
 // Implements the goto class
 public class ORModuleContributor implements GotoClassContributor, ChooseByNameContributorEx {
@@ -43,8 +43,8 @@ public void processElementsWithName(@NotNull String name, @NotNull Processor<Nav
     public String getQualifiedName(NavigationItem item) {
         if (item instanceof FileBase) {
             return ((FileBase) item).getModuleName();
-        } else if (item instanceof PsiQualifiedNamedElement) {
-            return ((PsiQualifiedNamedElement) item).getQualifiedName();
+        } else if (item instanceof PsiQualifiedElement) {
+            return ((PsiQualifiedElement) item).getQualifiedName();
         }
         return null;
     }
diff --git a/src/com/reason/ide/insight/provider/FreeExpressionCompletionProvider.java b/src/com/reason/ide/insight/provider/FreeExpressionCompletionProvider.java
index c76a0c29b..b5c75e7e4 100644
--- a/src/com/reason/ide/insight/provider/FreeExpressionCompletionProvider.java
+++ b/src/com/reason/ide/insight/provider/FreeExpressionCompletionProvider.java
@@ -25,7 +25,6 @@
 import com.reason.lang.core.psi.PsiAnnotation;
 import com.reason.lang.core.psi.PsiException;
 import com.reason.lang.core.psi.PsiExternal;
-import com.reason.lang.core.psi.PsiInclude;
 import com.reason.lang.core.psi.PsiInnerModule;
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiModule;
@@ -114,28 +113,23 @@ public static void addCompletions(@NotNull QNameFinder qnameFinder, @NotNull Str
         }
 
         while (item != null) {
-            if (item instanceof PsiInclude) {
-                //Set<PsiModule> modulesFromQn = psiFinder.findModulesFromQn(((PsiInclude) item).getQualifiedName(), interfaceOrImplementation, scope);
-                //for (PsiModule module : modulesFromQn) {
-                //    for (PsiNamedElement expression : module.getExpressions()) {
-                //        resultSet.addElement(LookupElementBuilder.
-                //                create(expression).
-                //                withTypeText(PsiSignatureUtil.getSignature(expression, element.getLanguage())).
-                //                withIcon(PsiIconUtil.getProvidersIcon(element, 0)));
-                //        if (item instanceof PsiType) {
-                //            expandType((PsiType) item, resultSet);
-                //        }
-                //    }
-                //}
-            } else if (item instanceof PsiInnerModule || item instanceof PsiLet || item instanceof PsiType || item instanceof PsiExternal
+            if (item instanceof PsiInnerModule || item instanceof PsiLet || item instanceof PsiType || item instanceof PsiExternal
                     || item instanceof PsiException || item instanceof PsiVal) {
-                PsiNamedElement expression = (PsiNamedElement) item;
-                resultSet.addElement(LookupElementBuilder.
-                        create(expression).
-                        withTypeText(PsiSignatureUtil.getSignature(expression, element.getLanguage())).
-                        withIcon(PsiIconUtil.getProvidersIcon(expression, 0)));
-                if (item instanceof PsiType) {
-                    expandType((PsiType) item, resultSet);
+                if (item instanceof PsiLet && ((PsiLet) item).isDeconsruction()) {
+                    for (PsiElement deconstructedElement : ((PsiLet) item).getDeconstructedElements()) {
+                        resultSet.addElement(LookupElementBuilder.create(deconstructedElement.getText()).
+                                withTypeText(PsiSignatureUtil.getSignature(item, element.getLanguage())).
+                                withIcon(Icons.LET));
+                    }
+                } else {
+                    PsiNamedElement expression = (PsiNamedElement) item;
+                    resultSet.addElement(LookupElementBuilder.
+                            create(expression).
+                            withTypeText(PsiSignatureUtil.getSignature(expression, element.getLanguage())).
+                            withIcon(PsiIconUtil.getProvidersIcon(expression, 0)));
+                    if (item instanceof PsiType) {
+                        expandType((PsiType) item, resultSet);
+                    }
                 }
             }
 
diff --git a/src/com/reason/ide/insight/provider/ModuleCompletionProvider.java b/src/com/reason/ide/insight/provider/ModuleCompletionProvider.java
index 95ad7899b..c736dda73 100644
--- a/src/com/reason/ide/insight/provider/ModuleCompletionProvider.java
+++ b/src/com/reason/ide/insight/provider/ModuleCompletionProvider.java
@@ -7,7 +7,6 @@
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.impl.source.tree.LeafPsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.tree.IElementType;
@@ -20,6 +19,7 @@
 import com.reason.ide.search.PsiFinder;
 import com.reason.lang.core.ModulePath;
 import com.reason.lang.core.psi.PsiInnerModule;
+import com.reason.lang.core.psi.PsiModule;
 import com.reason.lang.core.psi.PsiUpperSymbol;
 import com.reason.lang.core.type.ORTypes;
 
@@ -54,7 +54,8 @@ public static void addCompletions(@NotNull ORTypes types, @NotNull PsiElement el
             }
         } else {
             PsiFinder psiFinder = PsiFinder.getInstance(project);
-            PsiQualifiedNamedElement foundModule = psiFinder.findModulesFromQn(modulePath.toString(), interfaceOrImplementation, scope).iterator().next();
+            Set<PsiModule> modulesFromQn = psiFinder.findModulesFromQn(modulePath.toString(), interfaceOrImplementation, scope);
+            PsiModule foundModule = modulesFromQn.isEmpty() ? null : modulesFromQn.iterator().next();
             if (foundModule != null) {
                 LOG.debug("  Found module", foundModule);
                 Collection<PsiInnerModule> modules = foundModule instanceof FileBase ? ((FileBase) foundModule).getModules() :
diff --git a/src/com/reason/ide/insight/provider/ObjectCompletionProvider.java b/src/com/reason/ide/insight/provider/ObjectCompletionProvider.java
index d1f60f1d8..73f16de8b 100644
--- a/src/com/reason/ide/insight/provider/ObjectCompletionProvider.java
+++ b/src/com/reason/ide/insight/provider/ObjectCompletionProvider.java
@@ -1,21 +1,22 @@
 package com.reason.ide.insight.provider;
 
+import java.util.*;
+import org.jetbrains.annotations.NotNull;
 import com.intellij.codeInsight.completion.CompletionResultSet;
 import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.impl.source.tree.LeafPsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.PsiIconUtil;
 import com.reason.Log;
 import com.reason.ide.search.PsiFinder;
-import com.reason.lang.core.psi.*;
+import com.reason.lang.core.psi.PsiLet;
+import com.reason.lang.core.psi.PsiLowerSymbol;
+import com.reason.lang.core.psi.PsiObjectField;
+import com.reason.lang.core.psi.PsiRecordField;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.*;
 
 import static com.reason.lang.core.ORFileType.interfaceOrImplementation;
 
@@ -35,7 +36,8 @@ public static void addCompletions(@NotNull ORTypes types, @NotNull PsiElement el
         if (previousLeaf != null) {
             IElementType previousElementType = previousLeaf.getNode().getElementType();
 
-            while (previousLeaf != null && previousElementType == types.LIDENT || previousElementType == types.SHARPSHARP || previousElementType == types.SHARP) {
+            while (previousLeaf != null && previousElementType == types.LIDENT || previousElementType == types.SHARPSHARP
+                    || previousElementType == types.SHARP) {
                 if (previousElementType == types.LIDENT) {
                     //noinspection ConstantConditions
                     LeafPsiElement node = (LeafPsiElement) previousLeaf.getNode();
@@ -52,16 +54,17 @@ public static void addCompletions(@NotNull ORTypes types, @NotNull PsiElement el
             return;
         }
 
-        PsiLet let = null;
         String lowerName = path.remove(0);
 
-        Collection<? extends PsiQualifiedNamedElement> lets = PsiFinder.getInstance(project).findLets(lowerName, interfaceOrImplementation);
-
+        PsiLet let = null;
+        Set<PsiLet> lets = PsiFinder.getInstance(project).findLets(lowerName, interfaceOrImplementation);
         if (!lets.isEmpty()) {
-            let = (PsiLet) lets.iterator().next();
+            let = lets.iterator().next();
         }
 
-        if (let == null) return;
+        if (let == null) {
+            return;
+        }
 
         if (let.isRecord()) {
             Collection<PsiRecordField> fields = let.getRecordFields();
@@ -79,8 +82,6 @@ public static void addCompletions(@NotNull ORTypes types, @NotNull PsiElement el
                     resultSet.addElement(LookupElementBuilder.create(name).withIcon(PsiIconUtil.getProvidersIcon(field, 0)));
                 }
             }
-
         }
-
     }
 }
diff --git a/src/com/reason/ide/intentions/ExpandLocalOpenIntention.java b/src/com/reason/ide/intentions/ExpandLocalOpenIntention.java
index 5ce3cc774..b21a09a36 100644
--- a/src/com/reason/ide/intentions/ExpandLocalOpenIntention.java
+++ b/src/com/reason/ide/intentions/ExpandLocalOpenIntention.java
@@ -4,7 +4,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.reason.lang.core.ORElementFactory;
+import com.reason.lang.core.ORCodeFactory;
 import com.reason.lang.core.psi.PsiLocalOpen;
 import com.reason.lang.reason.RmlTypes;
 import org.jetbrains.annotations.Nls;
@@ -56,7 +56,7 @@ void runInvoke(@NotNull Project project, @NotNull PsiLocalOpen parentElement) {
         }
 
         String text = parentElement.getText();
-        PsiElement newOpen = ORElementFactory.createExpression(project, "{ open " + modulePath + "; " + text.substring(1, text.length() - 1) + "; }");
+        PsiElement newOpen = ORCodeFactory.createExpression(project, "{ open " + modulePath + "; " + text.substring(1, text.length() - 1) + "; }");
         if (newOpen != null) {
             grandParentElement.getNode().replaceChild(parentElement.getNode(), newOpen.getNode());
         }
diff --git a/src/com/reason/ide/intentions/FunctionBracesIntention.java b/src/com/reason/ide/intentions/FunctionBracesIntention.java
index 14b32c358..c16a5f7a0 100644
--- a/src/com/reason/ide/intentions/FunctionBracesIntention.java
+++ b/src/com/reason/ide/intentions/FunctionBracesIntention.java
@@ -1,16 +1,16 @@
 package com.reason.ide.intentions;
 
-import org.jetbrains.annotations.Nls;
-import org.jetbrains.annotations.NotNull;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.reason.lang.core.ORElementFactory;
+import com.reason.lang.core.ORCodeFactory;
 import com.reason.lang.core.psi.PsiFunction;
 import com.reason.lang.core.psi.PsiFunctionBody;
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiScopedExpr;
 import com.reason.lang.reason.RmlTypes;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NotNull;
 
 public class FunctionBracesIntention extends AbstractBaseIntention<PsiFunction> {
 
@@ -54,7 +54,7 @@ public boolean isAvailable(@NotNull Project project, @NotNull PsiFunction parent
     void runInvoke(@NotNull Project project, @NotNull PsiFunction oldFunction) {
         String text = oldFunction.getText();
         String[] tokens = text.split("=>", 2);
-        PsiLet newSyntax = (PsiLet) ORElementFactory.createExpression(project, "let x = " + tokens[0] + "=> {" + tokens[1] + "; };");
+        PsiLet newSyntax = (PsiLet) ORCodeFactory.createExpression(project, "let x = " + tokens[0] + "=> {" + tokens[1] + "; };");
 
         if (newSyntax != null) {
             PsiFunction newFunction = newSyntax.getFunction();
diff --git a/src/com/reason/ide/search/PsiFinder.java b/src/com/reason/ide/search/PsiFinder.java
index 09b356151..6c65cdc42 100644
--- a/src/com/reason/ide/search/PsiFinder.java
+++ b/src/com/reason/ide/search/PsiFinder.java
@@ -8,11 +8,11 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.psi.stubs.StubIndexKey;
 import com.intellij.util.CommonProcessors;
+import com.intellij.util.containers.ArrayListSet;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.reason.Joiner;
 import com.reason.Log;
@@ -38,6 +38,7 @@
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiModule;
 import com.reason.lang.core.psi.PsiParameter;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 import com.reason.lang.core.psi.PsiRecordField;
 import com.reason.lang.core.psi.PsiType;
 import com.reason.lang.core.psi.PsiVal;
@@ -194,39 +195,39 @@ public Set<PsiModule> findComponents(@NotNull GlobalSearchScope scope) {
     }
 
     @NotNull
-    public Collection<PsiParameter> findParameters(@NotNull String name, @NotNull ORFileType fileType) {
+    public Set<PsiParameter> findParameters(@NotNull String name, @NotNull ORFileType fileType) {
         return findLowerSymbols("parameters", name, fileType, IndexKeys.PARAMETERS, PsiParameter.class, allScope(m_project));
     }
 
     @NotNull
-    public Collection<PsiLet> findLets(@NotNull String name, @NotNull ORFileType fileType) {
+    public Set<PsiLet> findLets(@NotNull String name, @NotNull ORFileType fileType) {
         return findLowerSymbols("lets", name, fileType, IndexKeys.LETS, PsiLet.class, allScope(m_project));
     }
 
     @NotNull
-    public Collection<PsiVal> findVals(@NotNull String name, @NotNull ORFileType fileType) {
+    public Set<PsiVal> findVals(@NotNull String name, @NotNull ORFileType fileType) {
         return findLowerSymbols("vals", name, fileType, IndexKeys.VALS, PsiVal.class, allScope(m_project));
     }
 
     @NotNull
-    public Collection<PsiType> findTypes(@NotNull String name, @NotNull ORFileType fileType) {
+    public Set<PsiType> findTypes(@NotNull String name, @NotNull ORFileType fileType) {
         return findLowerSymbols("types", name, fileType, IndexKeys.TYPES, PsiType.class, allScope(m_project));
     }
 
     @NotNull
-    public Collection<PsiRecordField> findRecordFields(@NotNull String name, @NotNull ORFileType fileType) {
+    public Set<PsiRecordField> findRecordFields(@NotNull String name, @NotNull ORFileType fileType) {
         return findLowerSymbols("record fields", name, fileType, IndexKeys.RECORD_FIELDS, PsiRecordField.class, allScope(m_project));
     }
 
     @NotNull
-    public Collection<PsiExternal> findExternals(@NotNull String name, @NotNull ORFileType fileType) {
+    public Set<PsiExternal> findExternals(@NotNull String name, @NotNull ORFileType fileType) {
         return findLowerSymbols("externals", name, fileType, IndexKeys.EXTERNALS, PsiExternal.class, allScope(m_project));
     }
 
     @NotNull
-    private <T extends PsiQualifiedNamedElement> Collection<T> findLowerSymbols(@NotNull String debugName, @NotNull String name, @NotNull ORFileType fileType,
-                                                                                @NotNull StubIndexKey<String, T> indexKey, @NotNull Class<T> clazz,
-                                                                                @NotNull GlobalSearchScope scope) {
+    private <T extends PsiQualifiedElement> Set<T> findLowerSymbols(@NotNull String debugName, @NotNull String name, @NotNull ORFileType fileType,
+                                                                    @NotNull StubIndexKey<String, T> indexKey, @NotNull Class<T> clazz,
+                                                                    @NotNull GlobalSearchScope scope) {
         Map<String/*qn*/, T> implNames = new THashMap<>();
         Map<String/*qn*/, T> intfNames = new THashMap<>();
 
@@ -269,7 +270,8 @@ private <T extends PsiQualifiedNamedElement> Collection<T> findLowerSymbols(@Not
             }
         }
 
-        List<T> result = new ArrayList<>(intfNames.values());
+        Set<T> result = new ArrayListSet<>();
+        result.addAll(intfNames.values());
         for (Map.Entry<String, T> entry : implNames.entrySet()) {
             if (!intfNames.containsKey(entry.getKey())) {
                 result.add(entry.getValue());
@@ -287,7 +289,7 @@ private <T extends PsiQualifiedNamedElement> Collection<T> findLowerSymbols(@Not
     }
 
     @Nullable
-    public PsiQualifiedNamedElement findVariant(@Nullable String qname, @NotNull GlobalSearchScope scope) {
+    public PsiVariantDeclaration findVariant(@Nullable String qname, @NotNull GlobalSearchScope scope) {
         if (qname == null) {
             return null;
         }
@@ -315,7 +317,7 @@ public Collection<PsiVariantDeclaration> findVariantByName(@Nullable String path
     }
 
     @Nullable
-    public PsiQualifiedNamedElement findException(@Nullable String qname, ORFileType fileType, @NotNull GlobalSearchScope scope) {
+    public PsiException findException(@Nullable String qname, ORFileType fileType, @NotNull GlobalSearchScope scope) {
         if (qname == null) {
             return null;
         }
diff --git a/src/com/reason/ide/search/RmlFindUsagesProvider.java b/src/com/reason/ide/search/RmlFindUsagesProvider.java
index c4e8a31a0..7da3827b0 100644
--- a/src/com/reason/ide/search/RmlFindUsagesProvider.java
+++ b/src/com/reason/ide/search/RmlFindUsagesProvider.java
@@ -1,27 +1,26 @@
 package com.reason.ide.search;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.HelpID;
 import com.intellij.lang.cacheBuilder.DefaultWordsScanner;
 import com.intellij.lang.cacheBuilder.WordsScanner;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.tree.TokenSet;
-import com.reason.lang.core.psi.*;
+import com.reason.lang.core.psi.PsiLowerSymbol;
+import com.reason.lang.core.psi.PsiQualifiedElement;
+import com.reason.lang.core.psi.PsiUpperSymbol;
 import com.reason.lang.reason.RmlLexer;
 import com.reason.lang.reason.RmlTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class RmlFindUsagesProvider implements com.intellij.lang.findUsages.FindUsagesProvider {
     @Nullable
     @Override
     public WordsScanner getWordsScanner() {
         RmlTypes types = RmlTypes.INSTANCE;
-        return new DefaultWordsScanner(new RmlLexer(),
-                TokenSet.create(types.C_UPPER_SYMBOL, types.C_LOWER_SYMBOL, types.C_VARIANT),
-                TokenSet.EMPTY,
-                TokenSet.EMPTY);
+        return new DefaultWordsScanner(new RmlLexer(), TokenSet.create(types.C_UPPER_SYMBOL, types.C_LOWER_SYMBOL, types.C_VARIANT), TokenSet.EMPTY,
+                                       TokenSet.EMPTY);
     }
 
     @Override
@@ -56,11 +55,8 @@ public String getDescriptiveName(@NotNull PsiElement element) {
     @NotNull
     @Override
     public String getNodeText(@NotNull PsiElement element, boolean useFullName) {
-        if (element instanceof PsiQualifiedNamedElement) {
-            String qualifiedName = ((PsiQualifiedNamedElement) element).getQualifiedName();
-            if (qualifiedName != null) {
-                return qualifiedName;
-            }
+        if (element instanceof PsiQualifiedElement) {
+            return ((PsiQualifiedElement) element).getQualifiedName();
         }
         if (element instanceof PsiNamedElement) {
             String name = ((PsiNamedElement) element).getName();
diff --git a/src/com/reason/ide/search/index/ExceptionFqnIndex.java b/src/com/reason/ide/search/index/ExceptionFqnIndex.java
index 8f161709c..a4566e67e 100644
--- a/src/com/reason/ide/search/index/ExceptionFqnIndex.java
+++ b/src/com/reason/ide/search/index/ExceptionFqnIndex.java
@@ -11,7 +11,7 @@
 import java.util.Collection;
 
 public class ExceptionFqnIndex extends IntStubIndexExtension<PsiException> {
-    private static final int VERSION = 1;
+    private static final int VERSION = 2;
     private static final ExceptionFqnIndex INSTANCE = new ExceptionFqnIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/ExceptionIndex.java b/src/com/reason/ide/search/index/ExceptionIndex.java
index 0b68e5be4..857e57fef 100644
--- a/src/com/reason/ide/search/index/ExceptionIndex.java
+++ b/src/com/reason/ide/search/index/ExceptionIndex.java
@@ -6,7 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ExceptionIndex extends StringStubIndexExtension<PsiException> {
-    private static final int VERSION = 2;
+    private static final int VERSION = 3;
     private static final ExceptionIndex INSTANCE = new ExceptionIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/ExternalIndex.java b/src/com/reason/ide/search/index/ExternalIndex.java
index 045f7f6a7..73217bb03 100644
--- a/src/com/reason/ide/search/index/ExternalIndex.java
+++ b/src/com/reason/ide/search/index/ExternalIndex.java
@@ -6,7 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ExternalIndex extends StringStubIndexExtension<PsiExternal> {
-    private static final int VERSION = 5;
+    private static final int VERSION = 6;
 
     @Override
     public int getVersion() {
diff --git a/src/com/reason/ide/search/index/LetFqnIndex.java b/src/com/reason/ide/search/index/LetFqnIndex.java
index 42d669702..227b05bb4 100644
--- a/src/com/reason/ide/search/index/LetFqnIndex.java
+++ b/src/com/reason/ide/search/index/LetFqnIndex.java
@@ -11,7 +11,7 @@
 import java.util.Collection;
 
 public class LetFqnIndex extends IntStubIndexExtension<PsiLet> {
-    private static final int VERSION = 2;
+    private static final int VERSION = 3;
     private static final LetFqnIndex INSTANCE = new LetFqnIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/LetIndex.java b/src/com/reason/ide/search/index/LetIndex.java
index f3747c431..40bfd5983 100644
--- a/src/com/reason/ide/search/index/LetIndex.java
+++ b/src/com/reason/ide/search/index/LetIndex.java
@@ -6,7 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class LetIndex extends StringStubIndexExtension<PsiLet> {
-    private static final int VERSION = 8;
+    private static final int VERSION = 9;
 
     @Override
     public int getVersion() {
diff --git a/src/com/reason/ide/search/index/ModuleComponentIndex.java b/src/com/reason/ide/search/index/ModuleComponentIndex.java
index 6b32ed764..a63bad127 100644
--- a/src/com/reason/ide/search/index/ModuleComponentIndex.java
+++ b/src/com/reason/ide/search/index/ModuleComponentIndex.java
@@ -7,7 +7,7 @@
 
 public class ModuleComponentIndex extends StringStubIndexExtension<PsiModule> {
 
-    private static final int VERSION = 5;
+    private static final int VERSION = 6;
     private static final ModuleComponentIndex INSTANCE = new ModuleComponentIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/ModuleFqnIndex.java b/src/com/reason/ide/search/index/ModuleFqnIndex.java
index 4873bb4f6..315e1461b 100644
--- a/src/com/reason/ide/search/index/ModuleFqnIndex.java
+++ b/src/com/reason/ide/search/index/ModuleFqnIndex.java
@@ -10,7 +10,7 @@
 import com.reason.lang.core.psi.PsiModule;
 
 public class ModuleFqnIndex extends IntStubIndexExtension<PsiModule> {
-    private static final int VERSION = 6;
+    private static final int VERSION = 7;
     private static final ModuleFqnIndex INSTANCE = new ModuleFqnIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/ModuleIndex.java b/src/com/reason/ide/search/index/ModuleIndex.java
index 792431b09..2f5fc1b4a 100644
--- a/src/com/reason/ide/search/index/ModuleIndex.java
+++ b/src/com/reason/ide/search/index/ModuleIndex.java
@@ -6,7 +6,7 @@
 import com.reason.lang.core.psi.PsiModule;
 
 public class ModuleIndex extends StringStubIndexExtension<PsiModule> {
-    private static final int VERSION = 14;
+    private static final int VERSION = 15;
     private static final ModuleIndex INSTANCE = new ModuleIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/RecordFieldIndex.java b/src/com/reason/ide/search/index/RecordFieldIndex.java
index 35c3c021d..890b29598 100644
--- a/src/com/reason/ide/search/index/RecordFieldIndex.java
+++ b/src/com/reason/ide/search/index/RecordFieldIndex.java
@@ -1,12 +1,12 @@
 package com.reason.ide.search.index;
 
+import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import com.reason.lang.core.psi.PsiRecordField;
-import org.jetbrains.annotations.NotNull;
 
 public class RecordFieldIndex extends StringStubIndexExtension<PsiRecordField> {
-    private static final int VERSION = 1;
+    private static final int VERSION = 2;
 
     @Override
     public int getVersion() {
diff --git a/src/com/reason/ide/search/index/TypeIndex.java b/src/com/reason/ide/search/index/TypeIndex.java
index 3cdd315b2..2c82ec8ae 100644
--- a/src/com/reason/ide/search/index/TypeIndex.java
+++ b/src/com/reason/ide/search/index/TypeIndex.java
@@ -6,7 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class TypeIndex extends StringStubIndexExtension<PsiType> {
-    private static final int VERSION = 7;
+    private static final int VERSION = 8;
 
     @Override
     public int getVersion() {
diff --git a/src/com/reason/ide/search/index/ValFqnIndex.java b/src/com/reason/ide/search/index/ValFqnIndex.java
index 44ee39b50..78140b0cf 100644
--- a/src/com/reason/ide/search/index/ValFqnIndex.java
+++ b/src/com/reason/ide/search/index/ValFqnIndex.java
@@ -11,7 +11,7 @@
 import java.util.Collection;
 
 public class ValFqnIndex extends IntStubIndexExtension<PsiVal> {
-    private static final int VERSION = 1;
+    private static final int VERSION = 2;
     private static final ValFqnIndex INSTANCE = new ValFqnIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/ValIndex.java b/src/com/reason/ide/search/index/ValIndex.java
index e32ab7b08..4a70be558 100644
--- a/src/com/reason/ide/search/index/ValIndex.java
+++ b/src/com/reason/ide/search/index/ValIndex.java
@@ -6,7 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ValIndex extends StringStubIndexExtension<PsiVal> {
-    private static final int VERSION = 8;
+    private static final int VERSION = 9;
 
     @Override
     public int getVersion() {
diff --git a/src/com/reason/ide/search/index/VariantFqnIndex.java b/src/com/reason/ide/search/index/VariantFqnIndex.java
index 27f4d499b..774bd0bc9 100644
--- a/src/com/reason/ide/search/index/VariantFqnIndex.java
+++ b/src/com/reason/ide/search/index/VariantFqnIndex.java
@@ -11,7 +11,7 @@
 import java.util.Collection;
 
 public class VariantFqnIndex extends IntStubIndexExtension<PsiVariantDeclaration> {
-    private static final int VERSION = 2;
+    private static final int VERSION = 3;
     private static final VariantFqnIndex INSTANCE = new VariantFqnIndex();
 
     @NotNull
diff --git a/src/com/reason/ide/search/index/VariantIndex.java b/src/com/reason/ide/search/index/VariantIndex.java
index 1340f212e..dc61717f3 100644
--- a/src/com/reason/ide/search/index/VariantIndex.java
+++ b/src/com/reason/ide/search/index/VariantIndex.java
@@ -1,12 +1,12 @@
 package com.reason.ide.search.index;
 
+import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.stubs.StringStubIndexExtension;
 import com.intellij.psi.stubs.StubIndexKey;
 import com.reason.lang.core.psi.PsiVariantDeclaration;
-import org.jetbrains.annotations.NotNull;
 
 public class VariantIndex extends StringStubIndexExtension<PsiVariantDeclaration> {
-    private static final int VERSION = 1;
+    private static final int VERSION = 2;
     private static final VariantIndex INSTANCE = new VariantIndex();
 
     @NotNull
@@ -14,7 +14,6 @@ public static VariantIndex getInstance() {
         return INSTANCE;
     }
 
-
     @Override
     public int getVersion() {
         return super.getVersion() + VERSION;
diff --git a/src/com/reason/lang/ParserScopeEnum.java b/src/com/reason/lang/ParserScopeEnum.java
index b8e85cf17..430dc99ec 100644
--- a/src/com/reason/lang/ParserScopeEnum.java
+++ b/src/com/reason/lang/ParserScopeEnum.java
@@ -33,6 +33,7 @@ public enum ParserScopeEnum {
     letNamedEq,
     letNamedSignature,
     letNamedBinding,
+    deconstruction,
 
     function,
     functionParameters,
@@ -162,5 +163,5 @@ public enum ParserScopeEnum {
     clazzBodyScope, clazzConstructor, clazzField, clazzFieldNamed, clazzMethod, clazzMethodNamed, clazzNamedParameters,
     clazzNamedConstructor, record, mixin, externalNamedSignatureEq, maybeRecordUsage, recordUsage, letNamedBindingFunction,
     typeBinding, recordFieldAnnotation, option, optionParameter, name, variant, variantConstructor,
-    variantConstructorParameter, variantConstructorParameters, unit,  localObjectOpen
+    variantConstructorParameter, variantConstructorParameters, unit, localObjectOpen
 }
diff --git a/src/com/reason/lang/core/ORElementFactory.java b/src/com/reason/lang/core/ORCodeFactory.java
similarity index 97%
rename from src/com/reason/lang/core/ORElementFactory.java
rename to src/com/reason/lang/core/ORCodeFactory.java
index 941c19255..a64abf87c 100644
--- a/src/com/reason/lang/core/ORElementFactory.java
+++ b/src/com/reason/lang/core/ORCodeFactory.java
@@ -1,7 +1,5 @@
 package com.reason.lang.core;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.Language;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
@@ -12,9 +10,11 @@
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiType;
 import com.reason.lang.reason.RmlLanguage;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class ORElementFactory {
-    private ORElementFactory() {
+public class ORCodeFactory {
+    private ORCodeFactory() {
     }
 
     @Nullable
diff --git a/src/com/reason/lang/core/ORUtil.java b/src/com/reason/lang/core/ORUtil.java
index be53770f3..11707859c 100644
--- a/src/com/reason/lang/core/ORUtil.java
+++ b/src/com/reason/lang/core/ORUtil.java
@@ -257,11 +257,16 @@ public static String getQualifiedPath(@NotNull PsiNameIdentifierOwner element) {
         PsiElement parent = element.getParent();
         while (parent != null) {
             if (parent instanceof PsiQualifiedElement) {
-                path = ((PsiQualifiedElement) parent).getQualifiedName();
-                parent = null;
+                if (parent instanceof PsiNameIdentifierOwner && ((PsiNameIdentifierOwner) parent).getNameIdentifier() == element) {
+                    return ((PsiQualifiedElement) parent).getPath();
+                }
+                return ((PsiQualifiedElement) parent).getQualifiedName() + (path.isEmpty() ? "" : "." + path);
             } else {
                 if (parent instanceof PsiNameIdentifierOwner) {
-                    path = ((PsiNamedElement) parent).getName();
+                    String parentName = ((PsiNamedElement) parent).getName();
+                    if (parentName != null && !parentName.isEmpty()) {
+                        path = parentName + (path.isEmpty() ? "" : "." + path);
+                    }
                 }
                 parent = parent.getParent();
             }
@@ -269,9 +274,9 @@ public static String getQualifiedPath(@NotNull PsiNameIdentifierOwner element) {
 
         try {
             PsiFile containingFile = element.getContainingFile(); // Fail in 2019.2... ?
-            return ((FileBase) containingFile).getQualifiedName() + (path == null || path.isEmpty() ? "" : "." + path);
+            return ((FileBase) containingFile).getQualifiedName() + (path.isEmpty() ? "" : "." + path);
         } catch (PsiInvalidElementAccessException e) {
-            return path == null ? "" : path;
+            return path;
         }
     }
 
diff --git a/src/com/reason/lang/core/PsiElementFactory.java b/src/com/reason/lang/core/PsiElementFactory.java
index 27b4eb17d..d796adb27 100644
--- a/src/com/reason/lang/core/PsiElementFactory.java
+++ b/src/com/reason/lang/core/PsiElementFactory.java
@@ -48,6 +48,8 @@ public static PsiElement createElement(@NotNull ORTypes types, @NotNull ASTNode
             return new PsiClassField(node);
         } else if (type == types.C_CLASS_METHOD) {
             return new PsiClassMethod(node);
+        } else if (type == types.C_DECONSTRUCTION) {
+            return new PsiDeconstruction(types, node);
         } else if (type == types.C_DIRECTIVE) {
             return new PsiDirective(node);
         } else if (type == types.C_MODULE_PATH) {
diff --git a/src/com/reason/lang/core/psi/PsiClass.java b/src/com/reason/lang/core/psi/PsiClass.java
index 1ce071bd1..fe0fefe97 100644
--- a/src/com/reason/lang/core/psi/PsiClass.java
+++ b/src/com/reason/lang/core/psi/PsiClass.java
@@ -1,15 +1,13 @@
 package com.reason.lang.core.psi;
 
+import java.util.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
 
-public interface PsiClass extends PsiNameIdentifierOwner, PsiQualifiedNamedElement, NavigatablePsiElement, PsiStructuredElement {
+public interface PsiClass extends PsiNameIdentifierOwner, PsiQualifiedElement, NavigatablePsiElement, PsiStructuredElement {
     @Nullable
     PsiElement getClassBody();
 
diff --git a/src/com/reason/lang/core/psi/PsiDeconstruction.java b/src/com/reason/lang/core/psi/PsiDeconstruction.java
new file mode 100644
index 000000000..16207ce60
--- /dev/null
+++ b/src/com/reason/lang/core/psi/PsiDeconstruction.java
@@ -0,0 +1,29 @@
+package com.reason.lang.core.psi;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
+import com.reason.lang.core.psi.impl.PsiToken;
+import com.reason.lang.core.type.ORTypes;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PsiDeconstruction extends PsiToken<ORTypes> {
+
+    public PsiDeconstruction(@NotNull ORTypes types, @NotNull ASTNode node) {
+        super(types, node);
+    }
+
+    public List<PsiElement> getDeconstructedElements() {
+        List<PsiElement> result = new ArrayList<>();
+        for (PsiElement child : getChildren()) {
+            IElementType elementType = child.getNode().getElementType();
+            if (elementType != m_types.LPAREN && elementType != m_types.COMMA && elementType != m_types.RPAREN) {
+                result.add(child);
+            }
+        }
+        return result;
+    }
+}
diff --git a/src/com/reason/lang/core/psi/PsiException.java b/src/com/reason/lang/core/psi/PsiException.java
index 8e66f2e7b..2b4feeded 100644
--- a/src/com/reason/lang/core/psi/PsiException.java
+++ b/src/com/reason/lang/core/psi/PsiException.java
@@ -2,9 +2,9 @@
 
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
 import com.reason.lang.core.stub.PsiExceptionStub;
 
-public interface PsiException extends NavigatablePsiElement, PsiStructuredElement, PsiNameIdentifierOwner, PsiQualifiedNamedElement, StubBasedPsiElement<PsiExceptionStub> {
+public interface PsiException
+        extends NavigatablePsiElement, PsiStructuredElement, PsiNameIdentifierOwner, PsiQualifiedElement, StubBasedPsiElement<PsiExceptionStub> {
 }
diff --git a/src/com/reason/lang/core/psi/PsiExternal.java b/src/com/reason/lang/core/psi/PsiExternal.java
index 4d599a14e..c3b9e5581 100644
--- a/src/com/reason/lang/core/psi/PsiExternal.java
+++ b/src/com/reason/lang/core/psi/PsiExternal.java
@@ -1,12 +1,12 @@
 package com.reason.lang.core.psi;
 
+import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
 import com.reason.lang.core.stub.PsiExternalStub;
-import org.jetbrains.annotations.NotNull;
 
-public interface PsiExternal extends PsiNameIdentifierOwner, PsiQualifiedNamedElement, PsiSignatureElement, PsiStructuredElement, StubBasedPsiElement<PsiExternalStub> {
+public interface PsiExternal
+        extends PsiNameIdentifierOwner, PsiQualifiedElement, PsiSignatureElement, PsiStructuredElement, StubBasedPsiElement<PsiExternalStub> {
 
     boolean isFunction();
 
diff --git a/src/com/reason/lang/core/psi/PsiFakeModule.java b/src/com/reason/lang/core/psi/PsiFakeModule.java
index a63e9d97e..861a2dc39 100644
--- a/src/com/reason/lang/core/psi/PsiFakeModule.java
+++ b/src/com/reason/lang/core/psi/PsiFakeModule.java
@@ -27,7 +27,13 @@ public PsiFakeModule(@NotNull ORTypes types, @NotNull PsiModuleStub stub, @NotNu
     }
     //endregion
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        return ((FileBase) getContainingFile()).getPath();
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         PsiModuleStub greenStub = getGreenStub();
diff --git a/src/com/reason/lang/core/psi/PsiFunctor.java b/src/com/reason/lang/core/psi/PsiFunctor.java
index 12accaada..70ff2b340 100644
--- a/src/com/reason/lang/core/psi/PsiFunctor.java
+++ b/src/com/reason/lang/core/psi/PsiFunctor.java
@@ -1,15 +1,13 @@
 package com.reason.lang.core.psi;
 
+import java.util.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Collection;
 
-public interface PsiFunctor extends PsiNameIdentifierOwner, PsiQualifiedNamedElement, NavigatablePsiElement, PsiStructuredElement {
+public interface PsiFunctor extends PsiNameIdentifierOwner, PsiQualifiedElement, NavigatablePsiElement, PsiStructuredElement {
     @Nullable
     PsiFunctorBinding getBinding();
 
diff --git a/src/com/reason/lang/core/psi/PsiLet.java b/src/com/reason/lang/core/psi/PsiLet.java
index d757f5b30..0db5ffd98 100644
--- a/src/com/reason/lang/core/psi/PsiLet.java
+++ b/src/com/reason/lang/core/psi/PsiLet.java
@@ -1,14 +1,17 @@
 package com.reason.lang.core.psi;
 
-import com.intellij.psi.*;
-import com.reason.lang.core.stub.PsiLetStub;
+import java.util.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.psi.NavigatablePsiElement;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiNameIdentifierOwner;
+import com.intellij.psi.StubBasedPsiElement;
+import com.reason.lang.core.stub.PsiLetStub;
 
-import java.util.Collection;
-import java.util.List;
-
-public interface PsiLet extends PsiVar, PsiSignatureElement, PsiInferredType, PsiQualifiedNamedElement, PsiNameIdentifierOwner, NavigatablePsiElement, PsiStructuredElement, StubBasedPsiElement<PsiLetStub> {
+public interface PsiLet
+        extends PsiVar, PsiSignatureElement, PsiInferredType, PsiQualifiedElement, PsiNameIdentifierOwner, NavigatablePsiElement, PsiStructuredElement,
+                StubBasedPsiElement<PsiLetStub> {
 
     @Nullable
     PsiLetBinding getBinding();
@@ -38,5 +41,10 @@ public interface PsiLet extends PsiVar, PsiSignatureElement, PsiInferredType, Ps
     Collection<PsiElement> getScopeChildren();
 
     @NotNull
-    String getQualifiedPath();
+    String getPath();
+
+    boolean isDeconsruction();
+
+    @NotNull
+    List<PsiElement> getDeconstructedElements();
 }
diff --git a/src/com/reason/lang/core/psi/PsiModule.java b/src/com/reason/lang/core/psi/PsiModule.java
index bef254196..a2d6f273e 100644
--- a/src/com/reason/lang/core/psi/PsiModule.java
+++ b/src/com/reason/lang/core/psi/PsiModule.java
@@ -5,12 +5,11 @@
 import org.jetbrains.annotations.Nullable;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 
 /**
  * Common interface to file-based modules and inner modules
  */
-public interface PsiModule extends PsiQualifiedNamedElement, NavigatablePsiElement, PsiStructuredElement {
+public interface PsiModule extends PsiQualifiedElement, NavigatablePsiElement, PsiStructuredElement {
 
     @Nullable
     String getAlias();
diff --git a/src/com/reason/lang/core/psi/PsiParameter.java b/src/com/reason/lang/core/psi/PsiParameter.java
index a0de41ba2..8583dd326 100644
--- a/src/com/reason/lang/core/psi/PsiParameter.java
+++ b/src/com/reason/lang/core/psi/PsiParameter.java
@@ -1,14 +1,9 @@
 package com.reason.lang.core.psi;
 
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
 import com.reason.lang.core.stub.PsiParameterStub;
-import org.jetbrains.annotations.Nullable;
 
-public interface PsiParameter extends PsiNameIdentifierOwner, PsiQualifiedNamedElement, PsiSignatureElement, StubBasedPsiElement<PsiParameterStub> {
+public interface PsiParameter extends PsiNameIdentifierOwner, PsiQualifiedElement, PsiSignatureElement, StubBasedPsiElement<PsiParameterStub> {
     boolean hasDefaultValue();
-
-    @Nullable
-    String getName();
 }
diff --git a/src/com/reason/lang/core/psi/PsiQualifiedElement.java b/src/com/reason/lang/core/psi/PsiQualifiedElement.java
deleted file mode 100644
index 1dc38e19d..000000000
--- a/src/com/reason/lang/core/psi/PsiQualifiedElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.reason.lang.core.psi;
-
-import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.NotNull;
-
-public interface PsiQualifiedElement extends PsiElement {
-    @NotNull
-    String getQualifiedName();
-}
diff --git a/src/com/reason/lang/core/psi/PsiRecordField.java b/src/com/reason/lang/core/psi/PsiRecordField.java
index 810df6316..e85d83628 100644
--- a/src/com/reason/lang/core/psi/PsiRecordField.java
+++ b/src/com/reason/lang/core/psi/PsiRecordField.java
@@ -2,13 +2,10 @@
 
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
 import com.reason.lang.core.stub.PsiRecordFieldStub;
-import org.jetbrains.annotations.Nullable;
 
-public interface PsiRecordField extends PsiNameIdentifierOwner, PsiQualifiedNamedElement, NavigatablePsiElement, PsiSignatureElement, StubBasedPsiElement<PsiRecordFieldStub> {
+public interface PsiRecordField
+        extends PsiNameIdentifierOwner, PsiQualifiedElement, NavigatablePsiElement, PsiSignatureElement, StubBasedPsiElement<PsiRecordFieldStub> {
 
-    @Nullable
-    String getPathName();
 }
diff --git a/src/com/reason/lang/core/psi/PsiType.java b/src/com/reason/lang/core/psi/PsiType.java
index 1470bf8ee..d72def0e9 100644
--- a/src/com/reason/lang/core/psi/PsiType.java
+++ b/src/com/reason/lang/core/psi/PsiType.java
@@ -1,13 +1,15 @@
 package com.reason.lang.core.psi;
 
-import com.intellij.psi.*;
-import com.reason.lang.core.stub.PsiTypeStub;
+import java.util.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.psi.NavigatablePsiElement;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiNameIdentifierOwner;
+import com.intellij.psi.StubBasedPsiElement;
+import com.reason.lang.core.stub.PsiTypeStub;
 
-import java.util.Collection;
-
-public interface PsiType extends PsiNameIdentifierOwner, PsiQualifiedNamedElement, NavigatablePsiElement, PsiStructuredElement, StubBasedPsiElement<PsiTypeStub> {
+public interface PsiType extends PsiNameIdentifierOwner, PsiQualifiedElement, NavigatablePsiElement, PsiStructuredElement, StubBasedPsiElement<PsiTypeStub> {
 
     @Nullable
     PsiTypeConstrName getConstrName();
diff --git a/src/com/reason/lang/core/psi/PsiVal.java b/src/com/reason/lang/core/psi/PsiVal.java
index 870d56851..ac1494336 100644
--- a/src/com/reason/lang/core/psi/PsiVal.java
+++ b/src/com/reason/lang/core/psi/PsiVal.java
@@ -2,9 +2,9 @@
 
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
 import com.reason.lang.core.stub.PsiValStub;
 
-public interface PsiVal extends PsiVar, PsiQualifiedNamedElement, PsiNameIdentifierOwner, PsiSignatureElement, NavigatablePsiElement, PsiStructuredElement, StubBasedPsiElement<PsiValStub> {
+public interface PsiVal extends PsiVar, PsiQualifiedElement, PsiNameIdentifierOwner, PsiSignatureElement, NavigatablePsiElement, PsiStructuredElement,
+                                StubBasedPsiElement<PsiValStub> {
 }
diff --git a/src/com/reason/lang/core/psi/PsiVariantDeclaration.java b/src/com/reason/lang/core/psi/PsiVariantDeclaration.java
index 46c82c0a8..0e4781250 100644
--- a/src/com/reason/lang/core/psi/PsiVariantDeclaration.java
+++ b/src/com/reason/lang/core/psi/PsiVariantDeclaration.java
@@ -1,9 +1,11 @@
 package com.reason.lang.core.psi;
 
+import java.util.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -12,14 +14,11 @@
 import com.reason.lang.core.psi.impl.PsiTokenStub;
 import com.reason.lang.core.stub.PsiVariantDeclarationStub;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
+import static java.util.Collections.*;
 
-import static java.util.Collections.emptyList;
-
-public class PsiVariantDeclaration extends PsiTokenStub<ORTypes, PsiVariantDeclarationStub> implements PsiNameIdentifierOwner, PsiQualifiedNamedElement, StubBasedPsiElement<PsiVariantDeclarationStub> {
+public class PsiVariantDeclaration extends PsiTokenStub<ORTypes, PsiVariantDeclarationStub>
+        implements PsiNameIdentifierOwner, PsiQualifiedElement, StubBasedPsiElement<PsiVariantDeclarationStub> {
 
     //region Constructors
     public PsiVariantDeclaration(@NotNull ORTypes types, @NotNull ASTNode node) {
@@ -49,7 +48,18 @@ public PsiElement setName(@NotNull String name) throws IncorrectOperationExcepti
         return this;
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        PsiVariantDeclarationStub stub = getGreenStub();
+        if (stub != null) {
+            return stub.getPath();
+        }
+
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         PsiVariantDeclarationStub stub = getGreenStub();
diff --git a/src/com/reason/lang/core/psi/impl/PsiClassImpl.java b/src/com/reason/lang/core/psi/impl/PsiClassImpl.java
index 127f7b954..91be2456c 100644
--- a/src/com/reason/lang/core/psi/impl/PsiClassImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiClassImpl.java
@@ -10,6 +10,7 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.reason.Icons;
+import com.reason.lang.core.ORUtil;
 import com.reason.lang.core.psi.PsiClass;
 import com.reason.lang.core.psi.PsiClassConstructor;
 import com.reason.lang.core.psi.PsiClassField;
@@ -28,6 +29,7 @@ public PsiClassImpl(@NotNull ORTypes types, @NotNull ASTNode node) {
     //endregion
 
     //region NamedElement
+    @Nullable
     @Override
     public String getName() {
         PsiElement nameIdentifier = getNameIdentifier();
@@ -47,10 +49,17 @@ public PsiElement setName(@NotNull String name) throws IncorrectOperationExcepti
     }
     //endregion
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
-        return getName();
+        String name = getName();
+        return name == null ? "" : name;
     }
 
     @Nullable
diff --git a/src/com/reason/lang/core/psi/impl/PsiExceptionImpl.java b/src/com/reason/lang/core/psi/impl/PsiExceptionImpl.java
index e54c27f3d..bd46fa1e5 100644
--- a/src/com/reason/lang/core/psi/impl/PsiExceptionImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiExceptionImpl.java
@@ -1,5 +1,8 @@
 package com.reason.lang.core.psi.impl;
 
+import javax.swing.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
@@ -11,10 +14,6 @@
 import com.reason.lang.core.psi.PsiUpperSymbol;
 import com.reason.lang.core.stub.PsiExceptionStub;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
 
 public class PsiExceptionImpl extends PsiTokenStub<ORTypes, PsiExceptionStub> implements PsiException {
 
@@ -34,10 +33,11 @@ public PsiElement getNameIdentifier() {
         return findChildByClass(PsiUpperSymbol.class);
     }
 
+    @Nullable
     @Override
     public String getName() {
         PsiElement nameIdentifier = getNameIdentifier();
-        return nameIdentifier == null ? "" : nameIdentifier.getText();
+        return nameIdentifier == null ? null : nameIdentifier.getText();
     }
 
     @NotNull
@@ -46,7 +46,18 @@ public PsiElement setName(@NotNull String name) throws IncorrectOperationExcepti
         return this;
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        PsiExceptionStub stub = getGreenStub();
+        if (stub != null) {
+            return stub.getPath();
+        }
+
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         PsiExceptionStub stub = getGreenStub();
diff --git a/src/com/reason/lang/core/psi/impl/PsiExternalImpl.java b/src/com/reason/lang/core/psi/impl/PsiExternalImpl.java
index 46d737d7b..5b3945a55 100644
--- a/src/com/reason/lang/core/psi/impl/PsiExternalImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiExternalImpl.java
@@ -44,13 +44,25 @@ public PsiElement getNameIdentifier() {
         return findChildByClass(PsiLowerSymbol.class);
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        PsiExternalStub stub = getGreenStub();
+        if (stub != null) {
+            return stub.getPath();
+        }
+
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         PsiExternalStub stub = getGreenStub();
         if (stub != null) {
             return stub.getQualifiedName();
         }
+
         return ORUtil.getQualifiedName(this);
     }
 
diff --git a/src/com/reason/lang/core/psi/impl/PsiFunctorImpl.java b/src/com/reason/lang/core/psi/impl/PsiFunctorImpl.java
index 8c42f14ea..b656d2b5d 100644
--- a/src/com/reason/lang/core/psi/impl/PsiFunctorImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiFunctorImpl.java
@@ -1,18 +1,21 @@
 package com.reason.lang.core.psi.impl;
 
+import java.util.*;
+import javax.swing.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
 import com.reason.Icons;
 import com.reason.lang.core.ORUtil;
-import com.reason.lang.core.psi.*;
+import com.reason.lang.core.psi.PsiFunctor;
+import com.reason.lang.core.psi.PsiFunctorBinding;
+import com.reason.lang.core.psi.PsiParameter;
+import com.reason.lang.core.psi.PsiParameters;
+import com.reason.lang.core.psi.PsiUpperSymbol;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-import java.util.Collection;
 
 public class PsiFunctorImpl extends PsiToken<ORTypes> implements PsiFunctor {
 
@@ -26,21 +29,24 @@ public PsiElement getNameIdentifier() {
         return ORUtil.findImmediateFirstChildOfClass(this, PsiUpperSymbol.class);
     }
 
+    @Nullable
     @Override
     public String getName() {
         PsiElement nameIdentifier = getNameIdentifier();
-        return nameIdentifier == null ? "" : nameIdentifier.getText();
+        return nameIdentifier == null ? null : nameIdentifier.getText();
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        // TODO: stub?
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
-        /*
-        PsiFunctorStub stub = getGreenStub();
-        if (stub != null) {
-            return stub.getQualifiedName();
-        }
-        */
+        // TODO: stub?
         return ORUtil.getQualifiedName(this);
     }
 
diff --git a/src/com/reason/lang/core/psi/impl/PsiIncludeImpl.java b/src/com/reason/lang/core/psi/impl/PsiIncludeImpl.java
index 1de1aedd6..d12e83217 100644
--- a/src/com/reason/lang/core/psi/impl/PsiIncludeImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiIncludeImpl.java
@@ -1,17 +1,16 @@
 package com.reason.lang.core.psi.impl;
 
+import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.xml.model.gotosymbol.GoToSymbolProvider;
 import com.reason.Icons;
 import com.reason.lang.core.ORUtil;
 import com.reason.lang.core.psi.PsiInclude;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
 
 public class PsiIncludeImpl extends PsiToken<ORTypes> implements PsiInclude {
 
@@ -21,33 +20,27 @@ public PsiIncludeImpl(@NotNull ORTypes types, @NotNull ASTNode node) {
     }
     //endregion
 
+    @Override
+    public PsiElement setName(@NotNull String name) throws IncorrectOperationException {
+        throw new IncorrectOperationException("Not implemented");
+    }
+
     @NotNull
     @Override
-    public String getQualifiedName() {
+    public String getPath() {
         PsiElement firstChild = PsiTreeUtil.skipWhitespacesForward(getFirstChild());
         return firstChild == null ? "" : ORUtil.getTextUntilTokenType(firstChild, null);
     }
 
+    @NotNull
+    @Override
+    public String getQualifiedName() {
+        return getPath();
+    }
+
     @Override
     public ItemPresentation getPresentation() {
-        return new ItemPresentation() {
-            @Nullable
-            @Override
-            public String getPresentableText() {
-                return getQualifiedName();
-            }
-
-            @Nullable
-            @Override
-            public String getLocationString() {
-                return null;
-            }
-
-            @Override
-            public Icon getIcon(boolean unused) {
-                return Icons.INCLUDE;
-            }
-        };
+        return new GoToSymbolProvider.BaseNavigationItem(this, getQualifiedName(), Icons.INCLUDE);
     }
 
     @NotNull
diff --git a/src/com/reason/lang/core/psi/impl/PsiInnerModuleImpl.java b/src/com/reason/lang/core/psi/impl/PsiInnerModuleImpl.java
index b745267b3..f0a8f64fa 100644
--- a/src/com/reason/lang/core/psi/impl/PsiInnerModuleImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiInnerModuleImpl.java
@@ -16,7 +16,6 @@
 import com.reason.ide.files.FileBase;
 import com.reason.ide.search.PsiFinder;
 import com.reason.lang.ModuleHelper;
-import com.reason.lang.core.ModulePath;
 import com.reason.lang.core.ORUtil;
 import com.reason.lang.core.psi.PsiExternal;
 import com.reason.lang.core.psi.PsiInclude;
@@ -37,9 +36,6 @@
 
 public class PsiInnerModuleImpl extends PsiTokenStub<ORTypes, PsiModuleStub> implements PsiInnerModule {
 
-    @Nullable
-    private ModulePath m_modulePath = null;
-
     //region Constructors
     public PsiInnerModuleImpl(@NotNull ORTypes types, @NotNull ASTNode node) {
         super(types, node);
@@ -51,10 +47,11 @@ public PsiInnerModuleImpl(@NotNull ORTypes types, @NotNull PsiModuleStub stub, @
     //endregion
 
     //region NamedElement
+    @Nullable
     @Override
     public String getName() {
         PsiElement nameIdentifier = getNameIdentifier();
-        return nameIdentifier == null ? "" : nameIdentifier.getText();
+        return nameIdentifier == null ? null : nameIdentifier.getText();
     }
 
     @Nullable
@@ -73,10 +70,22 @@ public PsiElement setName(@NotNull String newName) throws IncorrectOperationExce
     @NotNull
     @Override
     public String getModuleName() {
-        return getName();
+        String name = getName();
+        return name == null ? "" : name;
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        PsiModuleStub stub = getGreenStub();
+        if (stub != null) {
+            return stub.getPath();
+        }
+
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         PsiModuleStub stub = getGreenStub();
@@ -301,27 +310,6 @@ public Icon getIcon(boolean unused) {
         };
     }
 
-    @NotNull
-    private ModulePath getPath() {
-        // TODO: use stub
-        if (m_modulePath == null) {
-            List<PsiElement> parents = new ArrayList<>();
-
-            PsiInnerModule parent = PsiTreeUtil.getStubOrPsiParentOfType(this, PsiInnerModule.class);
-            while (parent != null) {
-                parents.add(parent);
-                parent = PsiTreeUtil.getStubOrPsiParentOfType(parent, PsiInnerModule.class);
-            }
-
-            parents.add(getContainingFile());
-
-            Collections.reverse(parents);
-            m_modulePath = new ModulePath(parents);
-        }
-
-        return m_modulePath;
-    }
-
     @Override
     public boolean isComponent() {
         PsiModuleStub stub = getGreenStub();
diff --git a/src/com/reason/lang/core/psi/impl/PsiLetImpl.java b/src/com/reason/lang/core/psi/impl/PsiLetImpl.java
index f912303c9..ca65cee22 100644
--- a/src/com/reason/lang/core/psi/impl/PsiLetImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiLetImpl.java
@@ -40,7 +40,7 @@ public PsiLetImpl(@NotNull ORTypes types, @NotNull PsiLetStub stub, @NotNull ISt
     @Nullable
     @Override
     public PsiElement getNameIdentifier() {
-        return ORUtil.findImmediateFirstChildOfAnyClass(this, PsiLowerSymbol.class, PsiScopedExpr.class);
+        return ORUtil.findImmediateFirstChildOfAnyClass(this, PsiLowerSymbol.class, PsiScopedExpr.class, PsiDeconstruction.class);
     }
 
     @Nullable
@@ -297,10 +297,26 @@ public String getQualifiedName() {
 
     @NotNull
     @Override
-    public String getQualifiedPath() {
+    public String getPath() {
         return ORUtil.getQualifiedPath(this); // stub + name using this
     }
 
+    @Override
+    public boolean isDeconsruction() {
+        PsiElement nameIdentifier = getNameIdentifier();
+        return nameIdentifier instanceof PsiDeconstruction;
+    }
+
+    @NotNull
+    @Override
+    public List<PsiElement> getDeconstructedElements() {
+        PsiElement nameIdentifier = getNameIdentifier();
+        if (nameIdentifier instanceof PsiDeconstruction) {
+            return ((PsiDeconstruction) nameIdentifier).getDeconstructedElements();
+        }
+        return Collections.emptyList();
+    }
+
     //region PsiStructuredElement
     @Override
     public boolean canBeDisplayed() {
diff --git a/src/com/reason/lang/core/psi/impl/PsiLowerSymbolImpl.java b/src/com/reason/lang/core/psi/impl/PsiLowerSymbolImpl.java
index 5e19731bd..8b3cab206 100644
--- a/src/com/reason/lang/core/psi/impl/PsiLowerSymbolImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiLowerSymbolImpl.java
@@ -4,7 +4,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.IncorrectOperationException;
-import com.reason.lang.core.ORElementFactory;
+import com.reason.lang.core.ORCodeFactory;
 import com.reason.lang.core.psi.PsiLowerSymbol;
 import com.reason.lang.core.psi.reference.PsiLowerSymbolReference;
 import com.reason.lang.core.type.ORTypes;
@@ -35,7 +35,7 @@ public PsiElement getNameIdentifier() {
     @NotNull
     @Override
     public PsiElement setName(@NotNull String newName) throws IncorrectOperationException {
-        PsiElement newNameIdentifier = ORElementFactory.createLetName(getProject(), newName);
+        PsiElement newNameIdentifier = ORCodeFactory.createLetName(getProject(), newName);
 
         ASTNode newNameNode = newNameIdentifier == null ? null : newNameIdentifier.getFirstChild().getNode();
         if (newNameNode != null) {
diff --git a/src/com/reason/lang/core/psi/impl/PsiOpenImpl.java b/src/com/reason/lang/core/psi/impl/PsiOpenImpl.java
index 2978b8cdd..ca76254d2 100644
--- a/src/com/reason/lang/core/psi/impl/PsiOpenImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiOpenImpl.java
@@ -1,17 +1,17 @@
 package com.reason.lang.core.psi.impl;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.xml.model.gotosymbol.GoToSymbolProvider;
 import com.reason.Icons;
 import com.reason.lang.core.ORUtil;
 import com.reason.lang.core.psi.PsiOpen;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
 
 public class PsiOpenImpl extends PsiToken<ORTypes> implements PsiOpen {
 
@@ -21,34 +21,27 @@ public PsiOpenImpl(@NotNull ORTypes types, @NotNull ASTNode node) {
     }
     //endregion
 
+    @Override
+    public PsiElement setName(@NotNull String name) throws IncorrectOperationException {
+        throw new IncorrectOperationException("Not implemented");
+    }
+
     @NotNull
     @Override
-    public String getQualifiedName() {
+    public String getPath() {
         PsiElement firstChild = PsiTreeUtil.skipWhitespacesForward(getFirstChild());
         return firstChild == null ? "" : ORUtil.getTextUntilTokenType(firstChild, null);
     }
 
+    @NotNull
+    @Override
+    public String getQualifiedName() {
+        return getPath();
+    }
+
     @Override
     public ItemPresentation getPresentation() {
-        return new ItemPresentation() {
-            @Nullable
-            @Override
-            public String getPresentableText() {
-                return getQualifiedName();
-            }
-
-            @Nullable
-            @Override
-            public String getLocationString() {
-                return null;
-            }
-
-            @Nullable
-            @Override
-            public Icon getIcon(boolean unused) {
-                return Icons.OPEN;
-            }
-        };
+        return new GoToSymbolProvider.BaseNavigationItem(this, getQualifiedName(), Icons.OPEN);
     }
 
     @Nullable
diff --git a/src/com/reason/lang/core/psi/impl/PsiParameterImpl.java b/src/com/reason/lang/core/psi/impl/PsiParameterImpl.java
index bf114d79a..21e97a0d6 100644
--- a/src/com/reason/lang/core/psi/impl/PsiParameterImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiParameterImpl.java
@@ -1,26 +1,22 @@
 package com.reason.lang.core.psi.impl;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
-import com.intellij.psi.PsiReference;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.reason.lang.core.ORUtil;
 import com.reason.lang.core.psi.PsiParameter;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 import com.reason.lang.core.psi.PsiSignature;
 import com.reason.lang.core.signature.ORSignature;
 import com.reason.lang.core.stub.PsiParameterStub;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class PsiParameterImpl extends PsiTokenStub<ORTypes, PsiParameterStub> implements PsiParameter {
 
-    @NotNull
-    PsiReference[] EMPTY_REFS = new PsiReference[0];
-
     //region Constructors
     public PsiParameterImpl(@NotNull ORTypes types, @NotNull ASTNode node) {
         super(types, node);
@@ -70,6 +66,14 @@ public boolean hasDefaultValue() {
         return ORUtil.nextSiblingWithTokenType(getFirstChild(), m_types.EQ) != null;
     }
 
+    @NotNull
+    @Override
+    public String getPath() {
+        PsiQualifiedElement qualifiedParent = PsiTreeUtil.getParentOfType(this, PsiQualifiedElement.class);
+        String parentQName = qualifiedParent == null ? null : qualifiedParent.getQualifiedName();
+        return parentQName == null ? "" : parentQName;
+    }
+
     @NotNull
     @Override
     public String getQualifiedName() {
@@ -77,14 +81,7 @@ public String getQualifiedName() {
         if (stub != null) {
             return stub.getQualifiedName();
         }
-        return getQualifiedPath() + "[" + getName() + "]";
-    }
-
-    @NotNull
-    private String getQualifiedPath() {
-        PsiQualifiedNamedElement qualifiedParent = PsiTreeUtil.getParentOfType(this, PsiQualifiedNamedElement.class);
-        String parentQName = qualifiedParent == null ? null : qualifiedParent.getQualifiedName();
-        return parentQName == null ? "" : parentQName;
+        return getPath() + "[" + getName() + "]";
     }
 
     @Nullable
diff --git a/src/com/reason/lang/core/psi/impl/PsiRecordFieldImpl.java b/src/com/reason/lang/core/psi/impl/PsiRecordFieldImpl.java
index 11ed478b6..fa7a94892 100644
--- a/src/com/reason/lang/core/psi/impl/PsiRecordFieldImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiRecordFieldImpl.java
@@ -1,5 +1,7 @@
 package com.reason.lang.core.psi.impl;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.stubs.IStubElementType;
@@ -12,8 +14,6 @@
 import com.reason.lang.core.signature.ORSignature;
 import com.reason.lang.core.stub.PsiRecordFieldStub;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 public class PsiRecordFieldImpl extends PsiTokenStub<ORTypes, PsiRecordFieldStub> implements PsiRecordField {
 
@@ -33,22 +33,27 @@ public PsiElement getNameIdentifier() {
         return getFirstChild();
     }
 
-    @Nullable
+    @NotNull
     @Override
-    public String getQualifiedName() {
+    public String getPath() {
         PsiRecordFieldStub stub = getGreenStub();
         if (stub != null) {
-            return stub.getQualifiedName();
+            return stub.getPath();
         }
 
-        return ORUtil.getQualifiedName(this);
+        PsiType parent = PsiTreeUtil.getParentOfType(this, PsiType.class);
+        return (parent == null) ? getName() : (ORUtil.getQualifiedPath(parent) + "." + getName());
     }
 
-    @Nullable
+    @NotNull
     @Override
-    public String getPathName() {
-        PsiType parent = PsiTreeUtil.getParentOfType(this, PsiType.class);
-        return (parent == null) ? getName() : (ORUtil.getQualifiedPath(parent) + "." + getName());
+    public String getQualifiedName() {
+        PsiRecordFieldStub stub = getGreenStub();
+        if (stub != null) {
+            return stub.getQualifiedName();
+        }
+
+        return ORUtil.getQualifiedName(this);
     }
 
     @Override
@@ -80,5 +85,4 @@ public ORSignature getORSignature() {
     public String toString() {
         return "Record field " + getQualifiedName();
     }
-
 }
\ No newline at end of file
diff --git a/src/com/reason/lang/core/psi/impl/PsiTypeImpl.java b/src/com/reason/lang/core/psi/impl/PsiTypeImpl.java
index 2b9a864b9..198ae2886 100644
--- a/src/com/reason/lang/core/psi/impl/PsiTypeImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiTypeImpl.java
@@ -108,7 +108,18 @@ public Collection<PsiVariantDeclaration> getVariants() {
         return emptyList();
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        PsiTypeStub stub = getGreenStub();
+        if (stub != null) {
+            return stub.getPath();
+        }
+
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         PsiTypeStub stub = getGreenStub();
diff --git a/src/com/reason/lang/core/psi/impl/PsiUpperSymbolImpl.java b/src/com/reason/lang/core/psi/impl/PsiUpperSymbolImpl.java
index cdd085351..c2b21f0ae 100644
--- a/src/com/reason/lang/core/psi/impl/PsiUpperSymbolImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiUpperSymbolImpl.java
@@ -5,8 +5,8 @@
 import com.intellij.psi.PsiReference;
 import com.intellij.util.IncorrectOperationException;
 import com.reason.ide.files.FileBase;
+import com.reason.lang.core.ORCodeFactory;
 import com.reason.lang.core.ORUtil;
-import com.reason.lang.core.ORElementFactory;
 import com.reason.lang.core.psi.PsiUpperSymbol;
 import com.reason.lang.core.psi.reference.PsiUpperSymbolReference;
 import com.reason.lang.core.type.ORTypes;
@@ -37,7 +37,7 @@ public PsiElement getNameIdentifier() {
     @NotNull
     @Override
     public PsiElement setName(@NotNull String newName) throws IncorrectOperationException {
-        PsiElement newNameIdentifier = ORElementFactory.createModuleName(getProject(), newName);
+        PsiElement newNameIdentifier = ORCodeFactory.createModuleName(getProject(), newName);
 
         ASTNode newNameNode = newNameIdentifier == null ? null : newNameIdentifier.getFirstChild().getNode();
         if (newNameNode != null) {
diff --git a/src/com/reason/lang/core/psi/impl/PsiValImpl.java b/src/com/reason/lang/core/psi/impl/PsiValImpl.java
index 9c47000c9..c399919c2 100644
--- a/src/com/reason/lang/core/psi/impl/PsiValImpl.java
+++ b/src/com/reason/lang/core/psi/impl/PsiValImpl.java
@@ -1,5 +1,9 @@
 package com.reason.lang.core.psi.impl;
 
+import java.util.*;
+import javax.swing.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiElement;
@@ -15,11 +19,6 @@
 import com.reason.lang.core.signature.ORSignature;
 import com.reason.lang.core.stub.PsiValStub;
 import com.reason.lang.core.type.ORTypes;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-import java.util.Collection;
 
 public class PsiValImpl extends PsiTokenStub<ORTypes, PsiValStub> implements PsiVal {
 
@@ -69,13 +68,25 @@ public boolean isFunction() {
         return false;
     }
 
-    @Nullable
+    @NotNull
+    @Override
+    public String getPath() {
+        PsiValStub stub = getGreenStub();
+        if (stub != null) {
+            return stub.getPath();
+        }
+
+        return ORUtil.getQualifiedPath(this);
+    }
+
+    @NotNull
     @Override
     public String getQualifiedName() {
         PsiValStub stub = getGreenStub();
         if (stub != null) {
             return stub.getQualifiedName();
         }
+
         return ORUtil.getQualifiedName(this);
     }
 
@@ -127,5 +138,4 @@ public Icon getIcon(boolean unused) {
     public String toString() {
         return "Val " + getQualifiedName();
     }
-
 }
diff --git a/src/com/reason/lang/core/psi/reference/ORFakeResolvedElement.java b/src/com/reason/lang/core/psi/reference/ORFakeResolvedElement.java
index 13f876609..212da6d74 100644
--- a/src/com/reason/lang/core/psi/reference/ORFakeResolvedElement.java
+++ b/src/com/reason/lang/core/psi/reference/ORFakeResolvedElement.java
@@ -17,7 +17,7 @@ public ORFakeResolvedElement(@NotNull PsiElement element) {
     @Nullable
     @Override
     public PsiElement getParent() {
-        return m_sourceElement.getContainingFile();
+        return m_sourceElement.getParent();
     }
 
     @Nullable
diff --git a/src/com/reason/lang/core/psi/reference/PsiLowerSymbolReference.java b/src/com/reason/lang/core/psi/reference/PsiLowerSymbolReference.java
index 1da8201c0..dfddea325 100644
--- a/src/com/reason/lang/core/psi/reference/PsiLowerSymbolReference.java
+++ b/src/com/reason/lang/core/psi/reference/PsiLowerSymbolReference.java
@@ -7,20 +7,20 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.PsiReferenceBase;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.IncorrectOperationException;
 import com.reason.Log;
 import com.reason.ide.search.PsiFinder;
 import com.reason.lang.QNameFinder;
-import com.reason.lang.core.ORElementFactory;
+import com.reason.lang.core.ORCodeFactory;
 import com.reason.lang.core.ORUtil;
 import com.reason.lang.core.psi.PsiExternal;
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiLowerSymbol;
 import com.reason.lang.core.psi.PsiModule;
 import com.reason.lang.core.psi.PsiParameter;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 import com.reason.lang.core.psi.PsiRecordField;
 import com.reason.lang.core.psi.PsiType;
 import com.reason.lang.core.psi.PsiTypeConstrName;
@@ -51,7 +51,7 @@ public PsiLowerSymbolReference(@NotNull PsiLowerSymbol element, @NotNull ORTypes
 
     @Override
     public PsiElement handleElementRename(@NotNull String newName) throws IncorrectOperationException {
-        PsiElement newNameIdentifier = ORElementFactory.createLetName(myElement.getProject(), newName);
+        PsiElement newNameIdentifier = ORCodeFactory.createLetName(myElement.getProject(), newName);
 
         ASTNode newNameNode = newNameIdentifier == null ? null : newNameIdentifier.getFirstChild().getNode();
         if (newNameNode != null) {
@@ -88,7 +88,7 @@ public PsiElement resolve() {
 
         PsiFinder psiFinder = PsiFinder.getInstance(myElement.getProject());
 
-        PsiNameIdentifierOwner result = null;
+        PsiElement result = null;
         int resultPosition = Integer.MAX_VALUE;
 
         // Find potential paths of current element
@@ -128,9 +128,24 @@ public PsiElement resolve() {
             LOG.debug("  filtered lets", filteredLets);
 
             for (PsiLet letResult : filteredLets) {
-                Integer letPosition = potentialPaths.get(letResult.getQualifiedName());
-                if (letPosition < resultPosition) {
-                    result = letResult;
+                PsiElement letIdentifier = null;
+                Integer letPosition = null;
+                if (letResult.isDeconsruction()) {
+                    for (PsiElement deconstructedElement : letResult.getDeconstructedElements()) {
+                        String qname = letResult.getPath() + "." + deconstructedElement.getText();
+                        letPosition = potentialPaths.get(qname);
+                        if (letPosition != null) {
+                            letIdentifier = deconstructedElement;
+                            break;
+                        }
+                    }
+                } else {
+                    letIdentifier = letResult;
+                    letPosition = potentialPaths.get(letResult.getQualifiedName());
+                }
+
+                if (letPosition != null && letPosition < resultPosition) {
+                    result = letIdentifier;
                     resultPosition = letPosition;
                     LOG.debug("  Found intermediate result", letResult, resultPosition);
                 } else {
@@ -213,13 +228,13 @@ public PsiElement resolve() {
         if (!recordFields.isEmpty()) {
             // Filter the fields, keep the ones with the same qualified name
             List<PsiRecordField> filteredFields = recordFields.stream().filter(element -> {
-                String pn = element.getPathName();
-                return m_referenceName.equals(pn) || potentialPaths.containsKey(pn);
+                String qp = element.getPath();
+                return m_referenceName.equals(qp) || potentialPaths.containsKey(qp);
             }).collect(toList());
             LOG.debug("  filtered fields", filteredFields);
 
             for (PsiRecordField fieldResult : filteredFields) {
-                Integer fieldPosition = potentialPaths.get(fieldResult.getPathName());
+                Integer fieldPosition = potentialPaths.get(fieldResult.getPath());
                 if (fieldPosition != null) {
                     if (fieldPosition < resultPosition) {
                         result = fieldResult;
@@ -233,15 +248,27 @@ public PsiElement resolve() {
         }
 
         if (result != null && LOG.isDebugEnabled()) {
-            LOG.debug("-> " + result + " (identifier=" + result.getNameIdentifier() + ")");
+            LOG.debug("-> " + result + " (identifier=" + (result instanceof PsiNameIdentifierOwner ? ((PsiNameIdentifierOwner) result).getNameIdentifier() :
+                    result) + ")");
         }
 
-        return result == null ? /*new ORFakeResolvedElement(getElement()) */null : result.getNameIdentifier();
+        return result == null ? new ORFakeResolvedElement(getElement()) :
+                result instanceof PsiNameIdentifierOwner ? ((PsiNameIdentifierOwner) result).getNameIdentifier() : result;
     }
 
     @NotNull
-    private Predicate<? super PsiQualifiedNamedElement> getPathPredicate(@NotNull Map<String, Integer> potentialPaths) {
+    private Predicate<? super PsiQualifiedElement> getPathPredicate(@NotNull Map<String, Integer> potentialPaths) {
         return element -> {
+            if (element instanceof PsiLet && ((PsiLet) element).isDeconsruction()) {
+                for (PsiElement deconstructedElement : ((PsiLet) element).getDeconstructedElements()) {
+                    String qn = element.getPath() + "." + deconstructedElement.getText();
+                    if ((m_referenceName != null && m_referenceName.equals(qn)) || potentialPaths.containsKey(qn)) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
             String qn = element.getQualifiedName();
             return (m_referenceName != null && m_referenceName.equals(qn)) || potentialPaths.containsKey(qn);
         };
@@ -256,7 +283,7 @@ private Map<String, Integer> getPotentialPaths() {
 
         Map<String, Integer> result = new THashMap<>();
 
-        List<PsiQualifiedNamedElement> resolvedPaths = new ArrayList<>();
+        List<PsiQualifiedElement> resolvedPaths = new ArrayList<>();
         Set<String> potentialPaths = qnameFinder.extractPotentialPaths(myElement);
         for (String pathName : potentialPaths) {
             Set<PsiModule> moduleAlias = psiFinder.findModuleAlias(pathName, scope);
@@ -275,7 +302,7 @@ private Map<String, Integer> getPotentialPaths() {
         }
 
         Integer position = 0;
-        for (PsiQualifiedNamedElement element : resolvedPaths) {
+        for (PsiQualifiedElement element : resolvedPaths) {
             if (element != null) {
                 result.put(element.getQualifiedName() + (element instanceof PsiParameter ? "" : "." + m_referenceName), position);
                 position++;
diff --git a/src/com/reason/lang/core/psi/reference/PsiUpperSymbolReference.java b/src/com/reason/lang/core/psi/reference/PsiUpperSymbolReference.java
index 99dc77856..70c6c7408 100644
--- a/src/com/reason/lang/core/psi/reference/PsiUpperSymbolReference.java
+++ b/src/com/reason/lang/core/psi/reference/PsiUpperSymbolReference.java
@@ -9,7 +9,6 @@
 import com.intellij.psi.PsiNameIdentifierOwner;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.PsiPolyVariantReferenceBase;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.ResolveResult;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -19,11 +18,12 @@
 import com.reason.Log;
 import com.reason.ide.search.PsiFinder;
 import com.reason.lang.QNameFinder;
-import com.reason.lang.core.ORElementFactory;
+import com.reason.lang.core.ORCodeFactory;
 import com.reason.lang.core.ORUtil;
 import com.reason.lang.core.psi.PsiException;
 import com.reason.lang.core.psi.PsiInnerModule;
 import com.reason.lang.core.psi.PsiModule;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 import com.reason.lang.core.psi.PsiUpperSymbol;
 import com.reason.lang.core.psi.PsiVariantDeclaration;
 import com.reason.lang.core.type.ORTypes;
@@ -65,14 +65,14 @@ public ResolveResult[] multiResolve(boolean incompleteCode) {
         LOG.debug("Find reference for upper symbol", m_referenceName);
 
         // Find potential paths of current element
-        Set<PsiQualifiedNamedElement> potentialPaths = getPotentialPaths();
+        Set<PsiQualifiedElement> potentialPaths = getPotentialPaths();
         if (potentialPaths.isEmpty()) {
             LOG.debug(" -> No potential path found");
         } else {
             ResolveResult[] resolveResults = new ResolveResult[potentialPaths.size()];
 
             int i = 0;
-            for (PsiQualifiedNamedElement referencedElement : potentialPaths) {
+            for (PsiQualifiedElement referencedElement : potentialPaths) {
                 if (LOG.isDebugEnabled()) {
                     boolean isInnerModule = referencedElement instanceof PsiInnerModule;
                     String alias = isInnerModule ? ((PsiInnerModule) referencedElement).getAlias() : null;
@@ -102,7 +102,7 @@ public PsiElement resolve() {
 
     @Override
     public PsiElement handleElementRename(@NotNull String newName) throws IncorrectOperationException {
-        PsiElement newNameIdentifier = ORElementFactory.createModuleName(myElement.getProject(), newName);
+        PsiElement newNameIdentifier = ORCodeFactory.createModuleName(myElement.getProject(), newName);
 
         ASTNode newNameNode = newNameIdentifier == null ? null : newNameIdentifier.getFirstChild().getNode();
         if (newNameNode != null) {
@@ -118,7 +118,7 @@ public PsiElement handleElementRename(@NotNull String newName) throws IncorrectO
         return myElement;
     }
 
-    private Set<PsiQualifiedNamedElement> getPotentialPaths() {
+    private Set<PsiQualifiedElement> getPotentialPaths() {
         Project project = myElement.getProject();
         GlobalSearchScope scope = GlobalSearchScope.allScope(project);
         PsiFinder psiFinder = PsiFinder.getInstance(project);
@@ -129,11 +129,11 @@ private Set<PsiQualifiedNamedElement> getPotentialPaths() {
             LOG.trace(" -> Paths before resolution: " + Joiner.join(", ", paths));
         }
 
-        Set<PsiQualifiedNamedElement> resolvedElements = new ArrayListSet<>();
+        Set<PsiQualifiedElement> resolvedElements = new ArrayListSet<>();
         for (String path : paths) {
             String qn = path + "." + m_referenceName;
 
-            PsiQualifiedNamedElement variant = psiFinder.findVariant(qn, scope);
+            PsiQualifiedElement variant = psiFinder.findVariant(qn, scope);
             if (variant != null) {
                 resolvedElements.add(variant);
             } else {
@@ -143,7 +143,7 @@ private Set<PsiQualifiedNamedElement> getPotentialPaths() {
                 if (!variants.isEmpty()) {
                     resolvedElements.addAll(variants);
                 } else {
-                    PsiQualifiedNamedElement exception = psiFinder.findException(qn, both, scope);
+                    PsiQualifiedElement exception = psiFinder.findException(qn, both, scope);
                     if (exception != null) {
                         resolvedElements.add(exception);
                     } else {
@@ -174,7 +174,7 @@ private Set<PsiQualifiedNamedElement> getPotentialPaths() {
     private static class UpperResolveResult implements ResolveResult {
         private PsiElement m_referencedIdentifier;
 
-        public UpperResolveResult(PsiQualifiedNamedElement referencedElement) {
+        public UpperResolveResult(PsiQualifiedElement referencedElement) {
             m_referencedIdentifier = referencedElement instanceof PsiNameIdentifierOwner ? ((PsiNameIdentifierOwner) referencedElement).getNameIdentifier() :
                     referencedElement;
         }
diff --git a/src/com/reason/lang/core/stub/PsiExceptionStub.java b/src/com/reason/lang/core/stub/PsiExceptionStub.java
index 31717afb7..035b89285 100644
--- a/src/com/reason/lang/core/stub/PsiExceptionStub.java
+++ b/src/com/reason/lang/core/stub/PsiExceptionStub.java
@@ -9,20 +9,26 @@
 
 public class PsiExceptionStub extends NamedStubBase<PsiException> {
 
+    private final String m_path;
     private final String m_qname;
 
-    public PsiExceptionStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname) {
+    public PsiExceptionStub(StubElement parent, @NotNull IStubElementType elementType, String name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
     }
 
-    public PsiExceptionStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname) {
+    public PsiExceptionStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
+    }
+
+    public String getPath() {
+        return m_path;
     }
 
     public String getQualifiedName() {
         return m_qname;
     }
-
 }
diff --git a/src/com/reason/lang/core/stub/PsiExternalStub.java b/src/com/reason/lang/core/stub/PsiExternalStub.java
index 217913b21..2670e4ba1 100644
--- a/src/com/reason/lang/core/stub/PsiExternalStub.java
+++ b/src/com/reason/lang/core/stub/PsiExternalStub.java
@@ -8,21 +8,28 @@
 import com.reason.lang.core.psi.PsiExternal;
 
 public class PsiExternalStub extends NamedStubBase<PsiExternal> {
+    private final String m_path;
     private final String m_qname;
     private final boolean m_isFunction;
 
-    public PsiExternalStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname, boolean isFunction) {
+    public PsiExternalStub(StubElement parent, @NotNull IStubElementType elementType, String name, String path, boolean isFunction) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
         m_isFunction = isFunction;
     }
 
-    public PsiExternalStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname, boolean isFunction) {
+    public PsiExternalStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String path, boolean isFunction) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
         m_isFunction = isFunction;
     }
 
+    public String getPath() {
+        return m_path;
+    }
+
     public String getQualifiedName() {
         return m_qname;
     }
diff --git a/src/com/reason/lang/core/stub/PsiLetStub.java b/src/com/reason/lang/core/stub/PsiLetStub.java
index 30558140c..824ac9b36 100644
--- a/src/com/reason/lang/core/stub/PsiLetStub.java
+++ b/src/com/reason/lang/core/stub/PsiLetStub.java
@@ -7,23 +7,28 @@
 import com.reason.lang.core.psi.PsiLet;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
+
 public class PsiLetStub extends NamedStubBase<PsiLet> {
     private final String m_qname;
     private final String m_alias;
-    private boolean m_isFunction;
+    private final boolean m_isFunction;
+    private final List<String> m_deconstructionNames;
 
-    public PsiLetStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname, String alias, boolean isFunction) {
+    public PsiLetStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname, String alias, boolean isFunction, List<String> deconstructionNames) {
         super(parent, elementType, name);
         m_qname = qname;
         m_alias = alias;
         m_isFunction = isFunction;
+        m_deconstructionNames = deconstructionNames;
     }
 
-    public PsiLetStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname, String alias, boolean isFunction) {
+    public PsiLetStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname, String alias, boolean isFunction, List<String> deconstructionNames) {
         super(parent, elementType, name);
         m_qname = qname;
         m_alias = alias;
         m_isFunction = isFunction;
+        m_deconstructionNames = deconstructionNames;
     }
 
     public String getQualifiedName() {
@@ -37,4 +42,8 @@ public String getAlias() {
     public boolean isFunction() {
         return m_isFunction;
     }
+
+    public List<String> getDeconstructionNames() {
+        return m_deconstructionNames;
+    }
 }
\ No newline at end of file
diff --git a/src/com/reason/lang/core/stub/PsiModuleStub.java b/src/com/reason/lang/core/stub/PsiModuleStub.java
index be0052b36..0b0670d6e 100644
--- a/src/com/reason/lang/core/stub/PsiModuleStub.java
+++ b/src/com/reason/lang/core/stub/PsiModuleStub.java
@@ -9,30 +9,37 @@
 import com.reason.lang.core.psi.PsiModule;
 
 public class PsiModuleStub extends NamedStubBase<PsiModule> {
+    private final String m_path;
     private final String m_qname;
     private final String m_alias;
     private final boolean m_isComponent;
     private final boolean m_isInterface;
 
-    public PsiModuleStub(StubElement parent, @NotNull IStubElementType elementType, @Nullable String name, @Nullable String qname, String alias,
+    public PsiModuleStub(StubElement parent, @NotNull IStubElementType elementType, @Nullable String name, @Nullable String path, String alias,
                          boolean isComponent, boolean isInterface) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path == null || path.length() == 0 ? "" + name : path + "." + name;
         m_alias = alias;
         m_isComponent = isComponent;
         m_isInterface = isInterface;
     }
 
-    public PsiModuleStub(StubElement parent, @NotNull IStubElementType elementType, @Nullable StringRef name, @Nullable String qname, String alias,
+    public PsiModuleStub(StubElement parent, @NotNull IStubElementType elementType, @Nullable StringRef name, @Nullable String path, String alias,
                          boolean isComponent, boolean isInterface) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path == null || path.length() == 0 ? "" + name : path + "." + name;
         m_alias = alias;
         m_isComponent = isComponent;
         m_isInterface = isInterface;
     }
 
-    @Nullable
+    public String getPath() {
+        return m_path;
+    }
+
+    @NotNull
     public String getQualifiedName() {
         return m_qname;
     }
diff --git a/src/com/reason/lang/core/stub/PsiRecordFieldStub.java b/src/com/reason/lang/core/stub/PsiRecordFieldStub.java
index 44be518f8..fcc2274d3 100644
--- a/src/com/reason/lang/core/stub/PsiRecordFieldStub.java
+++ b/src/com/reason/lang/core/stub/PsiRecordFieldStub.java
@@ -1,23 +1,30 @@
 package com.reason.lang.core.stub;
 
+import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.NamedStubBase;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.io.StringRef;
 import com.reason.lang.core.psi.PsiRecordField;
-import org.jetbrains.annotations.NotNull;
 
 public class PsiRecordFieldStub extends NamedStubBase<PsiRecordField> {
+    private final String m_path;
     private final String m_qname;
 
-    public PsiRecordFieldStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname) {
+    public PsiRecordFieldStub(StubElement parent, @NotNull IStubElementType elementType, String name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
     }
 
-    public PsiRecordFieldStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname) {
+    public PsiRecordFieldStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
+    }
+
+    public String getPath() {
+        return m_path;
     }
 
     public String getQualifiedName() {
diff --git a/src/com/reason/lang/core/stub/PsiTypeStub.java b/src/com/reason/lang/core/stub/PsiTypeStub.java
index 81da6ce28..f474b7b27 100644
--- a/src/com/reason/lang/core/stub/PsiTypeStub.java
+++ b/src/com/reason/lang/core/stub/PsiTypeStub.java
@@ -8,16 +8,23 @@
 import org.jetbrains.annotations.NotNull;
 
 public class PsiTypeStub extends NamedStubBase<PsiType> {
+    private final String m_path;
     private final String m_qname;
 
-    public PsiTypeStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname) {
+    public PsiTypeStub(StubElement parent, @NotNull IStubElementType elementType, String name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
     }
 
-    public PsiTypeStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname) {
+    public PsiTypeStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
+    }
+
+    public String getPath() {
+        return m_path;
     }
 
     public String getQualifiedName() {
diff --git a/src/com/reason/lang/core/stub/PsiValStub.java b/src/com/reason/lang/core/stub/PsiValStub.java
index ce21412f1..ceba77809 100644
--- a/src/com/reason/lang/core/stub/PsiValStub.java
+++ b/src/com/reason/lang/core/stub/PsiValStub.java
@@ -1,28 +1,35 @@
 package com.reason.lang.core.stub;
 
+import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.NamedStubBase;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.io.StringRef;
 import com.reason.lang.core.psi.PsiVal;
-import org.jetbrains.annotations.NotNull;
 
 public class PsiValStub extends NamedStubBase<PsiVal> {
-    private String m_qname;
-    private boolean m_isFunction;
+    private final String m_path;
+    private final String m_qname;
+    private final boolean m_isFunction;
 
-    public PsiValStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname, boolean isFunction) {
+    public PsiValStub(StubElement parent, @NotNull IStubElementType elementType, String name, String path, boolean isFunction) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
         m_isFunction = isFunction;
     }
 
-    public PsiValStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname, boolean isFunction) {
+    public PsiValStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String path, boolean isFunction) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
         m_isFunction = isFunction;
     }
 
+    public String getPath() {
+        return m_path;
+    }
+
     public String getQualifiedName() {
         return m_qname;
     }
diff --git a/src/com/reason/lang/core/stub/PsiVariantDeclarationStub.java b/src/com/reason/lang/core/stub/PsiVariantDeclarationStub.java
index 0f037ef41..654dae777 100644
--- a/src/com/reason/lang/core/stub/PsiVariantDeclarationStub.java
+++ b/src/com/reason/lang/core/stub/PsiVariantDeclarationStub.java
@@ -8,17 +8,23 @@
 import com.reason.lang.core.psi.PsiVariantDeclaration;
 
 public class PsiVariantDeclarationStub extends NamedStubBase<PsiVariantDeclaration> {
-
+    private final String m_path;
     private final String m_qname;
 
-    public PsiVariantDeclarationStub(StubElement parent, @NotNull IStubElementType elementType, String name, String qname) {
+    public PsiVariantDeclarationStub(StubElement parent, @NotNull IStubElementType elementType, String name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
     }
 
-    public PsiVariantDeclarationStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String qname) {
+    public PsiVariantDeclarationStub(StubElement parent, @NotNull IStubElementType elementType, StringRef name, String path) {
         super(parent, elementType, name);
-        m_qname = qname;
+        m_path = path;
+        m_qname = path + "." + name;
+    }
+
+    public String getPath() {
+        return m_path;
     }
 
     public String getQualifiedName() {
diff --git a/src/com/reason/lang/core/stub/type/PsiExceptionStubElementType.java b/src/com/reason/lang/core/stub/type/PsiExceptionStubElementType.java
index d4661efab..fdb5dd124 100644
--- a/src/com/reason/lang/core/stub/type/PsiExceptionStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiExceptionStubElementType.java
@@ -25,20 +25,20 @@ public PsiException createPsi(@NotNull final PsiExceptionStub stub) {
 
     @NotNull
     public PsiExceptionStub createStub(@NotNull final PsiException psi, final StubElement parentStub) {
-        return new PsiExceptionStub(parentStub, this, psi.getName(), psi.getQualifiedName());
+        return new PsiExceptionStub(parentStub, this, psi.getName(), psi.getPath());
     }
 
     public void serialize(@NotNull final PsiExceptionStub stub, @NotNull final StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeUTFFast(stub.getQualifiedName());
+        dataStream.writeUTFFast(stub.getPath());
     }
 
     @NotNull
     public PsiExceptionStub deserialize(@NotNull final StubInputStream dataStream, final StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
-        String qname = dataStream.readUTFFast();
+        String path = dataStream.readUTFFast();
 
-        return new PsiExceptionStub(parentStub, this, name, qname);
+        return new PsiExceptionStub(parentStub, this, name, path);
     }
 
     public void indexStub(@NotNull final PsiExceptionStub stub, @NotNull final IndexSink sink) {
diff --git a/src/com/reason/lang/core/stub/type/PsiExternalStubElementType.java b/src/com/reason/lang/core/stub/type/PsiExternalStubElementType.java
index 14a71faaa..8248beb6a 100644
--- a/src/com/reason/lang/core/stub/type/PsiExternalStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiExternalStubElementType.java
@@ -26,22 +26,22 @@ public PsiExternalImpl createPsi(@NotNull PsiExternalStub stub) {
 
     @NotNull
     public PsiExternalStub createStub(@NotNull PsiExternal psi, StubElement parentStub) {
-        return new PsiExternalStub(parentStub, this, psi.getName(), psi.getQualifiedName(), psi.isFunction());
+        return new PsiExternalStub(parentStub, this, psi.getName(), psi.getPath(), psi.isFunction());
     }
 
     public void serialize(@NotNull PsiExternalStub stub, @NotNull StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeUTFFast(stub.getQualifiedName());
+        dataStream.writeUTFFast(stub.getPath());
         dataStream.writeBoolean(stub.isFunction());
     }
 
     @NotNull
     public PsiExternalStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
-        String qname = dataStream.readUTFFast();
+        String path = dataStream.readUTFFast();
         boolean isFunction = dataStream.readBoolean();
 
-        return new PsiExternalStub(parentStub, this, name, qname, isFunction);
+        return new PsiExternalStub(parentStub, this, name, path, isFunction);
     }
 
     public void indexStub(@NotNull PsiExternalStub stub, @NotNull IndexSink sink) {
diff --git a/src/com/reason/lang/core/stub/type/PsiFakeModuleStubElementType.java b/src/com/reason/lang/core/stub/type/PsiFakeModuleStubElementType.java
index a26580a18..d5104f0e8 100644
--- a/src/com/reason/lang/core/stub/type/PsiFakeModuleStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiFakeModuleStubElementType.java
@@ -29,7 +29,7 @@ public PsiFakeModule createPsi(@NotNull final PsiModuleStub stub) {
     @NotNull
     public PsiModuleStub createStub(@NotNull final PsiFakeModule fakeModule, final StubElement parentStub) {
         FileBase file = (FileBase) fakeModule.getContainingFile();
-        return new PsiModuleStub(parentStub, this, file.getModuleName(), file.getModuleName(), file.getAlias(), file.isComponent(), file.isInterface());
+        return new PsiModuleStub(parentStub, this, file.getModuleName(), "", file.getAlias(), file.isComponent(), file.isInterface());
     }
 
     public void serialize(@NotNull final PsiModuleStub stub, @NotNull final StubOutputStream dataStream) throws IOException {
diff --git a/src/com/reason/lang/core/stub/type/PsiLetStubElementType.java b/src/com/reason/lang/core/stub/type/PsiLetStubElementType.java
index ab235dc55..cb88061fd 100644
--- a/src/com/reason/lang/core/stub/type/PsiLetStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiLetStubElementType.java
@@ -1,6 +1,8 @@
 package com.reason.lang.core.stub.type;
 
 import com.intellij.lang.Language;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.stubs.*;
 import com.intellij.util.io.StringRef;
 import com.reason.ide.search.index.IndexKeys;
@@ -12,6 +14,8 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class PsiLetStubElementType extends IStubElementType<PsiLetStub, PsiLet> {
 
@@ -26,7 +30,16 @@ public PsiLetImpl createPsi(@NotNull PsiLetStub stub) {
 
     @NotNull
     public PsiLetStub createStub(@NotNull PsiLet psi, StubElement parentStub) {
-        return new PsiLetStub(parentStub, this, psi.getName(), psi.getQualifiedName(), psi.getAlias(), psi.isFunction());
+        List<String> deconstructedNames = new ArrayList<>();
+        if (psi.isDeconsruction()) {
+            List<PsiElement> elements = psi.getDeconstructedElements();
+            for (PsiElement element : elements) {
+                if (element instanceof PsiNamedElement) {
+                    deconstructedNames.add(((PsiNamedElement) element).getName());
+                }
+            }
+        }
+        return new PsiLetStub(parentStub, this, psi.getName(), psi.getQualifiedName(), psi.getAlias(), psi.isFunction(), deconstructedNames);
     }
 
     public void serialize(@NotNull PsiLetStub stub, @NotNull StubOutputStream dataStream) throws IOException {
@@ -34,6 +47,14 @@ public void serialize(@NotNull PsiLetStub stub, @NotNull StubOutputStream dataSt
         dataStream.writeUTFFast(stub.getQualifiedName());
         dataStream.writeBoolean(stub.isFunction());
 
+        List<String> deconstructionNames = stub.getDeconstructionNames();
+        dataStream.writeByte(deconstructionNames.size());
+        if (!deconstructionNames.isEmpty()) {
+            for (String name : deconstructionNames) {
+                dataStream.writeUTFFast(name);
+            }
+        }
+
         String alias = stub.getAlias();
         dataStream.writeBoolean(alias != null);
         if (alias != null) {
@@ -47,19 +68,34 @@ public PsiLetStub deserialize(@NotNull StubInputStream dataStream, StubElement p
         String qname = dataStream.readUTFFast();
         boolean isFunction = dataStream.readBoolean();
 
+        List<String> deconstructionNames = new ArrayList<>();
+        byte namesCount = dataStream.readByte();
+        if (namesCount > 0) {
+            for (int i = 0; i < namesCount; i++) {
+                 deconstructionNames.add(dataStream.readUTFFast());
+            }
+        }
+
         String alias = null;
         boolean isAlias = dataStream.readBoolean();
         if (isAlias) {
             alias = dataStream.readUTFFast();
         }
 
-        return new PsiLetStub(parentStub, this, name, qname, alias, isFunction);
+        return new PsiLetStub(parentStub, this, name, qname, alias, isFunction, deconstructionNames);
     }
 
     public void indexStub(@NotNull PsiLetStub stub, @NotNull IndexSink sink) {
-        String name = stub.getName();
-        if (name != null) {
-            sink.occurrence(IndexKeys.LETS, name);
+        List<String> deconstructionNames = stub.getDeconstructionNames();
+        if (deconstructionNames.isEmpty()) {
+            String name = stub.getName();
+            if (name != null) {
+                sink.occurrence(IndexKeys.LETS, name);
+            }
+        } else {
+            for (String name : deconstructionNames) {
+                sink.occurrence(IndexKeys.LETS, name);
+            }
         }
 
         String fqn = stub.getQualifiedName();
diff --git a/src/com/reason/lang/core/stub/type/PsiModuleStubElementType.java b/src/com/reason/lang/core/stub/type/PsiModuleStubElementType.java
index ddd9c6478..3fd073cdb 100644
--- a/src/com/reason/lang/core/stub/type/PsiModuleStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiModuleStubElementType.java
@@ -28,12 +28,12 @@ public PsiInnerModuleImpl createPsi(@NotNull final PsiModuleStub stub) {
 
     @NotNull
     public PsiModuleStub createStub(@NotNull final PsiInnerModule psi, final StubElement parentStub) {
-        return new PsiModuleStub(parentStub, this, psi.getName(), psi.getQualifiedName(), psi.getAlias(), psi.isComponent(), psi.isInterface());
+        return new PsiModuleStub(parentStub, this, psi.getName(), psi.getPath(), psi.getAlias(), psi.isComponent(), psi.isInterface());
     }
 
     public void serialize(@NotNull final PsiModuleStub stub, @NotNull final StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeUTFFast(stub.getQualifiedName());
+        dataStream.writeUTFFast(stub.getPath());
         dataStream.writeBoolean(stub.isComponent());
         dataStream.writeBoolean(stub.isInterface());
 
@@ -47,7 +47,7 @@ public void serialize(@NotNull final PsiModuleStub stub, @NotNull final StubOutp
     @NotNull
     public PsiModuleStub deserialize(@NotNull final StubInputStream dataStream, final StubElement parentStub) throws IOException {
         StringRef moduleName = dataStream.readName();
-        String qname = dataStream.readUTFFast();
+        String path = dataStream.readUTFFast();
         boolean isComponent = dataStream.readBoolean();
         boolean isInterface = dataStream.readBoolean();
         assert moduleName != null;
@@ -58,7 +58,7 @@ public PsiModuleStub deserialize(@NotNull final StubInputStream dataStream, fina
             alias = dataStream.readUTFFast();
         }
 
-        return new PsiModuleStub(parentStub, this, moduleName, qname, alias, isComponent, isInterface);
+        return new PsiModuleStub(parentStub, this, moduleName, path, alias, isComponent, isInterface);
     }
 
     public void indexStub(@NotNull final PsiModuleStub stub, @NotNull final IndexSink sink) {
diff --git a/src/com/reason/lang/core/stub/type/PsiRecordFieldStubElementType.java b/src/com/reason/lang/core/stub/type/PsiRecordFieldStubElementType.java
index 5f86dc3bc..bd964275e 100644
--- a/src/com/reason/lang/core/stub/type/PsiRecordFieldStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiRecordFieldStubElementType.java
@@ -1,16 +1,19 @@
 package com.reason.lang.core.stub.type;
 
+import java.io.*;
+import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.Language;
-import com.intellij.psi.stubs.*;
+import com.intellij.psi.stubs.IStubElementType;
+import com.intellij.psi.stubs.IndexSink;
+import com.intellij.psi.stubs.StubElement;
+import com.intellij.psi.stubs.StubInputStream;
+import com.intellij.psi.stubs.StubOutputStream;
 import com.intellij.util.io.StringRef;
 import com.reason.ide.search.index.IndexKeys;
 import com.reason.lang.core.psi.PsiRecordField;
 import com.reason.lang.core.psi.impl.PsiRecordFieldImpl;
 import com.reason.lang.core.stub.PsiRecordFieldStub;
 import com.reason.lang.core.type.ORTypesUtil;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
 
 public class PsiRecordFieldStubElementType extends IStubElementType<PsiRecordFieldStub, PsiRecordField> {
 
@@ -25,19 +28,19 @@ public PsiRecordFieldImpl createPsi(@NotNull final PsiRecordFieldStub stub) {
 
     @NotNull
     public PsiRecordFieldStub createStub(@NotNull final PsiRecordField psi, final StubElement parentStub) {
-        return new PsiRecordFieldStub(parentStub, this, psi.getName(), psi.getQualifiedName());
+        return new PsiRecordFieldStub(parentStub, this, psi.getName(), psi.getPath());
     }
 
     public void serialize(@NotNull final PsiRecordFieldStub stub, @NotNull final StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeUTFFast(stub.getQualifiedName());
+        dataStream.writeUTFFast(stub.getPath());
     }
 
     @NotNull
     public PsiRecordFieldStub deserialize(@NotNull final StubInputStream dataStream, final StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
-        String qname = dataStream.readUTFFast();
-        return new PsiRecordFieldStub(parentStub, this, name, qname);
+        String path = dataStream.readUTFFast();
+        return new PsiRecordFieldStub(parentStub, this, name, path);
     }
 
     public void indexStub(@NotNull final PsiRecordFieldStub stub, @NotNull final IndexSink sink) {
diff --git a/src/com/reason/lang/core/stub/type/PsiTypeStubElementType.java b/src/com/reason/lang/core/stub/type/PsiTypeStubElementType.java
index 3a05e546a..7f682c60b 100644
--- a/src/com/reason/lang/core/stub/type/PsiTypeStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiTypeStubElementType.java
@@ -25,19 +25,19 @@ public PsiTypeImpl createPsi(@NotNull final PsiTypeStub stub) {
 
     @NotNull
     public PsiTypeStub createStub(@NotNull final PsiType psi, final StubElement parentStub) {
-        return new PsiTypeStub(parentStub, this, psi.getName(), psi.getQualifiedName());
+        return new PsiTypeStub(parentStub, this, psi.getName(), psi.getPath());
     }
 
     public void serialize(@NotNull final PsiTypeStub stub, @NotNull final StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeUTFFast(stub.getQualifiedName());
+        dataStream.writeUTFFast(stub.getPath());
     }
 
     @NotNull
     public PsiTypeStub deserialize(@NotNull final StubInputStream dataStream, final StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
-        String qname = dataStream.readUTFFast();
-        return new PsiTypeStub(parentStub, this, name, qname);
+        String path = dataStream.readUTFFast();
+        return new PsiTypeStub(parentStub, this, name, path);
     }
 
     public void indexStub(@NotNull final PsiTypeStub stub, @NotNull final IndexSink sink) {
diff --git a/src/com/reason/lang/core/stub/type/PsiValStubElementType.java b/src/com/reason/lang/core/stub/type/PsiValStubElementType.java
index e1e2cc12b..d8b3c2af0 100644
--- a/src/com/reason/lang/core/stub/type/PsiValStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiValStubElementType.java
@@ -26,21 +26,21 @@ public PsiValImpl createPsi(@NotNull PsiValStub stub) {
 
     @NotNull
     public PsiValStub createStub(@NotNull PsiVal psi, StubElement parentStub) {
-        return new PsiValStub(parentStub, this, psi.getName(), psi.getQualifiedName(), psi.isFunction());
+        return new PsiValStub(parentStub, this, psi.getName(), psi.getPath(), psi.isFunction());
     }
 
     public void serialize(@NotNull PsiValStub stub, @NotNull StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeUTFFast(stub.getQualifiedName());
+        dataStream.writeUTFFast(stub.getPath());
         dataStream.writeBoolean(stub.isFunction());
     }
 
     @NotNull
     public PsiValStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
-        String qname = dataStream.readUTFFast();
+        String path = dataStream.readUTFFast();
         boolean isFunction = dataStream.readBoolean();
-        return new PsiValStub(parentStub, this, name, qname, isFunction);
+        return new PsiValStub(parentStub, this, name, path, isFunction);
     }
 
     public void indexStub(@NotNull PsiValStub stub, @NotNull IndexSink sink) {
diff --git a/src/com/reason/lang/core/stub/type/PsiVariantStubElementType.java b/src/com/reason/lang/core/stub/type/PsiVariantStubElementType.java
index 4789756b1..492527560 100644
--- a/src/com/reason/lang/core/stub/type/PsiVariantStubElementType.java
+++ b/src/com/reason/lang/core/stub/type/PsiVariantStubElementType.java
@@ -24,20 +24,20 @@ public PsiVariantDeclaration createPsi(@NotNull final PsiVariantDeclarationStub
 
     @NotNull
     public PsiVariantDeclarationStub createStub(@NotNull final PsiVariantDeclaration psi, final StubElement parentStub) {
-        return new PsiVariantDeclarationStub(parentStub, this, psi.getName(), psi.getQualifiedName());
+        return new PsiVariantDeclarationStub(parentStub, this, psi.getName(), psi.getPath());
     }
 
     public void serialize(@NotNull final PsiVariantDeclarationStub stub, @NotNull final StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeUTFFast(stub.getQualifiedName());
+        dataStream.writeUTFFast(stub.getPath());
     }
 
     @NotNull
     public PsiVariantDeclarationStub deserialize(@NotNull final StubInputStream dataStream, final StubElement parentStub) throws IOException {
         StringRef moduleName = dataStream.readName();
-        String qname = dataStream.readUTFFast();
+        String path = dataStream.readUTFFast();
 
-        return new PsiVariantDeclarationStub(parentStub, this, moduleName, qname);
+        return new PsiVariantDeclarationStub(parentStub, this, moduleName, path);
     }
 
     public void indexStub(@NotNull final PsiVariantDeclarationStub stub, @NotNull final IndexSink sink) {
diff --git a/src/com/reason/lang/core/type/ORTypes.java b/src/com/reason/lang/core/type/ORTypes.java
index 5506d3dd9..b8599b869 100644
--- a/src/com/reason/lang/core/type/ORTypes.java
+++ b/src/com/reason/lang/core/type/ORTypes.java
@@ -12,6 +12,7 @@ public abstract class ORTypes {
     public IElementType C_CLASS_METHOD;
     public IElementType C_CLASS_PARAMS;
     public IElementType C_CLASS_STMT;
+    public IElementType C_DECONSTRUCTION;
     public IElementType C_DIRECTIVE;
     public IElementType C_EXTERNAL_STMT;
     public IElementType C_EXP_TYPE;
diff --git a/src/com/reason/lang/ocaml/OclParser.java b/src/com/reason/lang/ocaml/OclParser.java
index 28ec64d9c..73fcc1c31 100644
--- a/src/com/reason/lang/ocaml/OclParser.java
+++ b/src/com/reason/lang/ocaml/OclParser.java
@@ -107,6 +107,8 @@ protected void parseFile(@NotNull PsiBuilder builder, @NotNull ParserState state
                 parseAssert(builder, state);
             } else if (tokenType == m_types.RAISE) {
                 parseRaise(builder, state);
+            } else if (tokenType == m_types.COMMA) {
+                parseComma(builder, state);
             }
             // while ... do ... done
             else if (tokenType == m_types.WHILE) {
@@ -203,6 +205,14 @@ private void parseRaise(@NotNull PsiBuilder builder, @NotNull ParserState state)
         }
     }
 
+    private void parseComma(@NotNull PsiBuilder builder, @NotNull ParserState state) {
+        if (state.isCurrentContext(let) && state.isCurrentResolution(genericExpression)) {
+            // It must be a deconstruction
+            // let ( a |>,<| b ) = ..
+            state.updateCurrentResolution(deconstruction).updateCurrentCompositeElementType(m_types.C_DECONSTRUCTION);
+        }
+    }
+
     private void parseLArray(@NotNull PsiBuilder builder, @NotNull ParserState state) {
         state.add(markScope(builder, array, m_types.C_SCOPED_EXPR, m_types.LARRAY));
     }
@@ -649,8 +659,14 @@ private void parseLParen(@NotNull PsiBuilder builder, @NotNull ParserState state
             // Overloading an operator: external (...) = ...
             state.updateCurrentResolution(externalNamed).complete();
             state.add(markScope(builder, localOpenScope, m_types.C_SCOPED_EXPR, m_types.LPAREN));
+        } else if (state.isCurrentResolution(let)) {
+            // Overloading operator OR deconstructing a term
+            //  let |>(<| + ) =
+            //  let |>(<| a, b ) =
+            state.add(markScope(builder, let, genericExpression, m_types.C_SCOPED_EXPR, m_types.LPAREN));
         } else if (state.isCurrentResolution(val)) {
-            // Overloading an operator: val (...) = ...
+            // Overloading an operator
+            //   val |>(<| .. ) = ..
             state.updateCurrentResolution(valNamed).complete();
             state.add(markScope(builder, valNamedSymbol, m_types.C_SCOPED_EXPR, m_types.LPAREN));
         } else if (state.isCurrentResolution(clazzNamed)) {
diff --git a/src/com/reason/lang/ocaml/OclQNameFinder.java b/src/com/reason/lang/ocaml/OclQNameFinder.java
index f9f45417f..423eb0bdb 100644
--- a/src/com/reason/lang/ocaml/OclQNameFinder.java
+++ b/src/com/reason/lang/ocaml/OclQNameFinder.java
@@ -4,7 +4,6 @@
 import java.util.stream.*;
 import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.containers.ArrayListSet;
 import com.reason.ide.files.FileBase;
@@ -59,7 +58,7 @@ public Set<String> extractPotentialPaths(@NotNull PsiElement element) {
                     qualifiedNames.add(letQName + pathExtension);
                 }
             } else if (item instanceof PsiFunction) {
-                PsiQualifiedNamedElement parent = PsiTreeUtil.getParentOfType(item, PsiQualifiedNamedElement.class);
+                PsiQualifiedElement parent = PsiTreeUtil.getParentOfType(item, PsiQualifiedElement.class);
                 if (parent != null) {
                     String parentQName = parent.getQualifiedName();
                     // Register all parameters of function
diff --git a/src/com/reason/lang/ocaml/OclTypes.java b/src/com/reason/lang/ocaml/OclTypes.java
index 5d54a39ee..18092d013 100644
--- a/src/com/reason/lang/ocaml/OclTypes.java
+++ b/src/com/reason/lang/ocaml/OclTypes.java
@@ -35,6 +35,7 @@ private OclTypes() {
         C_CLASS_STMT = new ORCompositeElementType("C_CLASS_STMT", OclLanguage.INSTANCE);
         C_CLASS_FIELD = new ORCompositeElementType("C_CLASS_FIELD", OclLanguage.INSTANCE);
         C_CLASS_METHOD = new ORCompositeElementType("C_CLASS_METHOD", OclLanguage.INSTANCE);
+        C_DECONSTRUCTION = new ORCompositeElementType("C_DECONSTRUCTION", OclLanguage.INSTANCE);
         C_DIRECTIVE = new ORCompositeElementType("C_DIRECTIVE", OclLanguage.INSTANCE);
         C_INCLUDE = new ORCompositeElementType("C_INCLUDE", OclLanguage.INSTANCE);
         C_FUN_CALL_PARAMS = new ORCompositeElementType("C_FUN_CALL_PARAMS", OclLanguage.INSTANCE);
diff --git a/src/com/reason/lang/reason/RmlParser.java b/src/com/reason/lang/reason/RmlParser.java
index bd7619417..f3176dc01 100644
--- a/src/com/reason/lang/reason/RmlParser.java
+++ b/src/com/reason/lang/reason/RmlParser.java
@@ -1,15 +1,17 @@
 package com.reason.lang.reason;
 
-import org.jetbrains.annotations.NotNull;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.tree.IElementType;
 import com.reason.lang.CommonParser;
 import com.reason.lang.ParserScope;
 import com.reason.lang.ParserState;
+import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.codeInsight.completion.CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED;
-import static com.intellij.lang.parser.GeneratedParserUtilBase.*;
-import static com.reason.lang.ParserScope.*;
+import static com.intellij.lang.parser.GeneratedParserUtilBase.current_position_;
+import static com.intellij.lang.parser.GeneratedParserUtilBase.empty_element_parsed_guard_;
+import static com.reason.lang.ParserScope.mark;
+import static com.reason.lang.ParserScope.markScope;
 import static com.reason.lang.ParserScopeEnum.*;
 
 public class RmlParser extends CommonParser<RmlTypes> {
@@ -310,6 +312,10 @@ private void parseComma(@NotNull PsiBuilder builder, @NotNull ParserState state)
             // We don't know yet but we need to complete the marker
             state.complete();
             state.popEnd();
+        } else if (state.isCurrentContext(let) && state.isCurrentResolution(genericExpression)) {
+            // It must be a deconstruction
+            // let ( a |>,<| b ) = ..
+            state.updateCurrentResolution(deconstruction).updateCurrentCompositeElementType(m_types.C_DECONSTRUCTION);
         }
     }
 
@@ -869,7 +875,13 @@ private void parseLParen(@NotNull PsiBuilder builder, @NotNull ParserState state
             // overloading an operator
             state.updateCurrentResolution(externalNamed);
             state.complete();
-        } else {
+        } else if (state.isCurrentResolution(let)) {
+            // Overloading operator OR deconstructing a term
+            //  let |>(<| + ) =
+            //  let |>(<| a, b ) =
+            state.add(markScope(builder, let, genericExpression, m_types.C_SCOPED_EXPR, m_types.LPAREN));
+        }
+        else {
             IElementType nextTokenType = builder.lookAhead(1);
 
             if (nextTokenType == m_types.DOT || nextTokenType == m_types.TILDE) {
diff --git a/src/com/reason/lang/reason/RmlQNameFinder.java b/src/com/reason/lang/reason/RmlQNameFinder.java
index b489af9c7..8f8723007 100644
--- a/src/com/reason/lang/reason/RmlQNameFinder.java
+++ b/src/com/reason/lang/reason/RmlQNameFinder.java
@@ -3,7 +3,6 @@
 import java.util.*;
 import org.jetbrains.annotations.NotNull;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.containers.ArrayListSet;
 import com.reason.ide.files.FileBase;
@@ -61,7 +60,7 @@ public Set<String> extractPotentialPaths(@NotNull PsiElement element) {
                     qualifiedNames.add(letQName + pathExtension);
                 }
             } else if (item instanceof PsiFunction) {
-                PsiQualifiedNamedElement parent = PsiTreeUtil.getParentOfType(item, PsiQualifiedNamedElement.class);
+                PsiQualifiedElement parent = PsiTreeUtil.getParentOfType(item, PsiQualifiedElement.class);
                 if (parent != null) {
                     String parentQName = parent.getQualifiedName();
                     // Register all parameters of function
diff --git a/src/com/reason/lang/reason/RmlTypes.java b/src/com/reason/lang/reason/RmlTypes.java
index e3419e4fb..51daed1fc 100644
--- a/src/com/reason/lang/reason/RmlTypes.java
+++ b/src/com/reason/lang/reason/RmlTypes.java
@@ -37,6 +37,7 @@ private RmlTypes() {
         C_CLASS_PARAMS = new ORCompositeElementType("C_CLASS_PARAMS", RmlLanguage.INSTANCE);
         C_CLASS_FIELD = new ORCompositeElementType("C_CLASS_FIELD", RmlLanguage.INSTANCE);
         C_CLASS_METHOD = new ORCompositeElementType("C_CLASS_METHOD", RmlLanguage.INSTANCE);
+        C_DECONSTRUCTION = new ORCompositeElementType("C_DECONSTRUCTION", RmlLanguage.INSTANCE);
         C_DIRECTIVE = new ORCompositeElementType("C_DIRECTIVE", RmlLanguage.INSTANCE);
         C_FUN_CALL_PARAMS = new ORCompositeElementType("C_FUN_CALL_PARAMS", RmlLanguage.INSTANCE);
         C_FUN_CALL_PARAM = new ORCompositeElementType("C_FUN_CALL_PARAM", RmlLanguage.INSTANCE);
diff --git a/tests/com/reason/ide/PsiFinderTest.java b/tests/com/reason/ide/PsiFinderTest.java
index 0e3fbb2cc..1d5f3d8ea 100644
--- a/tests/com/reason/ide/PsiFinderTest.java
+++ b/tests/com/reason/ide/PsiFinderTest.java
@@ -1,19 +1,19 @@
 package com.reason.ide;
 
 import java.util.*;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import com.reason.ide.files.FileBase;
 import com.reason.ide.search.PsiFinder;
+import com.reason.lang.core.psi.PsiException;
 import com.reason.lang.core.psi.PsiInnerModule;
+import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiModule;
 
 import static com.intellij.psi.search.GlobalSearchScope.allScope;
 import static com.reason.lang.core.ORFileType.*;
 
 @SuppressWarnings("ConstantConditions")
-public class PsiFinderTest extends BasePlatformTestCase {
+public class PsiFinderTest extends ORBasePlatformTestCase {
 
     public void testModuleLet() {
         myFixture.configureByText("ReasonReact.rei", "module Router: { type api;  };");
@@ -72,9 +72,9 @@ public void testException() {
         myFixture.configureByText("A.re", "exception Ex;");
 
         PsiFinder psiFinder = PsiFinder.getInstance(getProject());
-        PsiQualifiedNamedElement intf1 = psiFinder.findException("A.Ex", interfaceOnly, allScope(getProject()));
-        PsiQualifiedNamedElement intf2 = psiFinder.findException("A.Ex", interfaceOrImplementation, allScope(getProject()));
-        PsiQualifiedNamedElement impl = psiFinder.findException("A.Ex", implementationOnly, allScope(getProject()));
+        PsiException intf1 = psiFinder.findException("A.Ex", interfaceOnly, allScope(getProject()));
+        PsiException intf2 = psiFinder.findException("A.Ex", interfaceOrImplementation, allScope(getProject()));
+        PsiException impl = psiFinder.findException("A.Ex", implementationOnly, allScope(getProject()));
 
         assertEquals("rei", intf1.getContainingFile().getFileType().getDefaultExtension());
         assertEquals("rei", intf2.getContainingFile().getFileType().getDefaultExtension());
@@ -93,4 +93,22 @@ public void testFindModuleAlias() {
         assertInstanceOf(moduleAliases.get(0), FileBase.class);
         assertInstanceOf(moduleAliases.get(1), FileBase.class);
     }
+
+    public void testRml_letDeconstruction() {
+        configureCode("A.re", "let x = something;");
+        configureCode("B.re", "let (x, y) = other;");
+
+        Set<PsiLet> lets = PsiFinder.getInstance(getProject()).findLets("x", both);
+
+        assertSize(2, lets);
+    }
+
+    public void testOcl_letDeconstruction() {
+        configureCode("A.ml", "let x = something");
+        configureCode("B.ml", "let (x, y) = other");
+
+        Set<PsiLet> lets = PsiFinder.getInstance(getProject()).findLets("x", both);
+
+        assertSize(2, lets);
+    }
 }
diff --git a/tests/com/reason/ide/completion/FreeCompletionTest.java b/tests/com/reason/ide/completion/FreeCompletionTest.java
index 9bdafc774..8f85f5a72 100644
--- a/tests/com/reason/ide/completion/FreeCompletionTest.java
+++ b/tests/com/reason/ide/completion/FreeCompletionTest.java
@@ -20,4 +20,13 @@ public void testPervasives() {
         assertSize(4, elements);
         assertContainsElements(elements, "int_of_string", "Belt", "Belt_Array", "x");
     }
+
+    public void testDeconstruction() {
+        configureCode("Dummy.re", "let (first, second) = myVar; <caret>");
+
+        myFixture.complete(CompletionType.BASIC, 1);
+        List<String> elements = myFixture.getLookupElementStrings();
+
+        assertContainsElements(elements, "first", "second");
+    }
 }
diff --git a/tests/com/reason/ide/reference/OclQNameFinderTest.java b/tests/com/reason/ide/reference/OclQNameFinderTest.java
new file mode 100644
index 000000000..311bda190
--- /dev/null
+++ b/tests/com/reason/ide/reference/OclQNameFinderTest.java
@@ -0,0 +1,15 @@
+package com.reason.ide.reference;
+
+import java.util.*;
+import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.lang.ocaml.OclQNameFinder;
+
+public class OclQNameFinderTest extends ORBasePlatformTestCase {
+
+    public void testLetBinding() {
+        configureCode("A.ml", "let make = increase<caret>()");
+
+        Set<String> paths = new OclQNameFinder().extractPotentialPaths(myFixture.getElementAtCaret());
+        assertSameElements(paths, "A.make", "A");
+    }
+}
diff --git a/tests/com/reason/ide/reference/ResolveExternalElementTest.java b/tests/com/reason/ide/reference/ResolveExternalElementTest.java
index dab375dbb..547fbfd15 100644
--- a/tests/com/reason/ide/reference/ResolveExternalElementTest.java
+++ b/tests/com/reason/ide/reference/ResolveExternalElementTest.java
@@ -1,8 +1,8 @@
 package com.reason.ide.reference;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 
 public class ResolveExternalElementTest extends ORBasePlatformTestCase {
 
@@ -10,8 +10,8 @@ public void testLocalOpenWithParens() {
         configureCode("A.re", "module A1 = { external a : int = \"\"; };");
         configureCode("B.re", "let b = A.(A1.a<caret>);");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1.a", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.A1.a", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
     }
 
     public void testLocalOpenWithParens2() {
@@ -19,7 +19,7 @@ public void testLocalOpenWithParens2() {
         myFixture.configureByText("B.re", "let a = A.A1.(a<caret>);");
 
         PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1.a", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        assertEquals("A.A1.a", ((PsiQualifiedElement) elementAtCaret.getParent()).getQualifiedName());
     }
 
     public void testLocalOpenWithPipeFirst() {
@@ -27,6 +27,6 @@ public void testLocalOpenWithPipeFirst() {
         myFixture.configureByText("B.re", "let x = A.A1.(x->add<caret>);");
 
         PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1.add", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        assertEquals("A.A1.add", ((PsiQualifiedElement) elementAtCaret.getParent()).getQualifiedName());
     }
 }
diff --git a/tests/com/reason/ide/reference/ResolveLetElementTest.java b/tests/com/reason/ide/reference/ResolveLetElementTest.java
index 62dc5b655..4514cf687 100644
--- a/tests/com/reason/ide/reference/ResolveLetElementTest.java
+++ b/tests/com/reason/ide/reference/ResolveLetElementTest.java
@@ -1,8 +1,9 @@
 package com.reason.ide.reference;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
 import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.lang.core.psi.PsiLet;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 
 public class ResolveLetElementTest extends ORBasePlatformTestCase {
 
@@ -10,60 +11,60 @@ public void testRml_LocalOpenWithParens() {
         configureCode("A.re", "module A1 = { let a = 3; };");
         configureCode("B.re", "let b = A.(A1.a<caret>);");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1.a", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.A1.a", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
     }
 
     public void testOcl_LocalOpenWithParens() {
         configureCode("A.ml", "module A1 = struct let a = 3 end");
         configureCode("B.ml", "let b = A.(A1.a<caret>)");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1.a", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.A1.a", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
     }
 
     public void testRml_LocalOpenWithParens2() {
         configureCode("A.re", "module A1 = { let a = 3; };");
         configureCode("B.re", "let a = A.A1.(a<caret>);");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1.a", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.A1.a", ((PsiLet) e.getParent()).getQualifiedName());
     }
 
     public void testLocalOpenWithPipeFirst() {
         configureCode("A.re", "module A1 = { let add = x => x + 3; };");
         configureCode("B.re", "let x = A.A1.(x->add<caret>);");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1.add", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.A1.add", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
     }
 
     public void testRml_InnerScope() {
         configureCode("A.re", "let x = 1; let a = { let x = 2; x<caret> + 10 };");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.a.x", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.a.x", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
     }
 
     public void testOcl_InnerScope() {
         configureCode("A.ml", "let x = 1\nlet a = let x = 2 in x<caret> + 10");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.a.x", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.a.x", ((PsiLet) e.getParent()).getQualifiedName());
     }
 
     public void testRml_InnerScopeInFunction() {
         configureCode("A.re", "let x = 1; let fn = { let x = 2; fn1(x<caret>); };");
 
         PsiElement e = myFixture.getElementAtCaret();
-        assertEquals("A.fn.x", ((PsiQualifiedNamedElement) e.getParent()).getQualifiedName());
+        assertEquals("A.fn.x", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
     }
 
     public void testOcl_InnerScopeInFunction() {
         configureCode("A.ml", "let x = 1\nlet fn = let x = 2 in fn1 x<caret>");
 
         PsiElement e = myFixture.getElementAtCaret();
-        assertEquals("A.fn.x", ((PsiQualifiedNamedElement) e.getParent()).getQualifiedName());
+        assertEquals("A.fn.x", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
     }
 
     public void testInnerScopeInImpl() {
@@ -71,7 +72,7 @@ public void testInnerScopeInImpl() {
         configureCode("A.re", "let x = 1; let fn = { let foo = 2; fn1(foo<caret>); };");
 
         PsiElement e = myFixture.getElementAtCaret();
-        assertEquals("A.fn.foo", ((PsiQualifiedNamedElement) e.getParent()).getQualifiedName());
+        assertEquals("A.fn.foo", ((PsiQualifiedElement) e.getParent()).getQualifiedName());
         assertEquals("A.re", e.getContainingFile().getName());
     }
 }
diff --git a/tests/com/reason/ide/reference/ResolveModuleElementTest.java b/tests/com/reason/ide/reference/ResolveModuleElementTest.java
index b92e0e465..b4c0d5a7a 100644
--- a/tests/com/reason/ide/reference/ResolveModuleElementTest.java
+++ b/tests/com/reason/ide/reference/ResolveModuleElementTest.java
@@ -1,42 +1,41 @@
 package com.reason.ide.reference;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.lang.core.psi.PsiModule;
 
-public class ResolveModuleElementTest extends BasePlatformTestCase {
+public class ResolveModuleElementTest extends ORBasePlatformTestCase {
 
     public void testBasicNull() {
-        myFixture.configureByText("Dimensions.re", "let space = 5;");
-        myFixture.configureByText("Comp.re", "Dimensions<caret>");
+        configureCode("Dimensions.re", "let space = 5;");
+        configureCode("Comp.re", "Dimensions<caret>");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("Dimensions.re", ((PsiQualifiedNamedElement) elementAtCaret).getName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("Dimensions.re", ((PsiModule) e).getName());
     }
 
     public void testBasic() {
-        myFixture.configureByText("Dimensions.re", "let space = 5;");
-        myFixture.configureByText("Comp.re", "let D = Dimensions<caret>");
+        configureCode("Dimensions.re", "let space = 5;");
+        configureCode("Comp.re", "let D = Dimensions<caret>");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("Dimensions.re", ((PsiQualifiedNamedElement) elementAtCaret).getName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("Dimensions.re", ((PsiModule) e).getName());
     }
 
     public void testWithAlias() {
-        myFixture.configureByText("A1.re", "module A11 = {};");
-        myFixture.configureByText("A.re", "module A1 = {};");
-        myFixture.configureByText("B.re", "module X = A; X.A1<caret>);");
+        configureCode("A1.re", "module A11 = {};");
+        configureCode("A.re", "module A1 = {};");
+        configureCode("B.re", "module X = A; X.A1<caret>);");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.A1", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.A1", ((PsiModule) e.getParent()).getQualifiedName());
     }
 
     public void testWithAliasAndInterface() {
-        myFixture.configureByText("C.rei", "module A1 = {};");
-        myFixture.configureByText("D.re", "module X = C; X.A1<caret>);");
+        configureCode("C.rei", "module A1 = {};");
+        configureCode("D.re", "module X = C; X.A1<caret>);");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("C.A1", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("C.A1", ((PsiModule) e.getParent()).getQualifiedName());
     }
-
 }
diff --git a/tests/com/reason/ide/reference/ResolveRecordFieldsTest.java b/tests/com/reason/ide/reference/ResolveRecordFieldsTest.java
index ac455826b..b910a2b45 100644
--- a/tests/com/reason/ide/reference/ResolveRecordFieldsTest.java
+++ b/tests/com/reason/ide/reference/ResolveRecordFieldsTest.java
@@ -1,20 +1,15 @@
 package com.reason.ide.reference;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.reason.ide.ORBasePlatformTestCase;
 import com.reason.lang.core.psi.PsiRecordField;
-import com.reason.lang.core.psi.PsiType;
 
-public class ResolveRecordFieldsTest extends BasePlatformTestCase {
+public class ResolveRecordFieldsTest extends ORBasePlatformTestCase {
 
     public void testSameNameWithPath() {
         myFixture.configureByText("A.re", "type t = { f: string }; let x: f<caret> = \"\";");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.t.f", ((PsiRecordField) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.t.f", ((PsiRecordField) e.getParent()).getQualifiedName());
     }
-
 }
diff --git a/tests/com/reason/ide/reference/ResolveTypeElementTest.java b/tests/com/reason/ide/reference/ResolveTypeElementTest.java
index 687cce676..02d61b55f 100644
--- a/tests/com/reason/ide/reference/ResolveTypeElementTest.java
+++ b/tests/com/reason/ide/reference/ResolveTypeElementTest.java
@@ -1,26 +1,24 @@
 package com.reason.ide.reference;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.lang.core.psi.PsiQualifiedElement;
 
-public class ResolveTypeElementTest extends BasePlatformTestCase {
+public class ResolveTypeElementTest extends ORBasePlatformTestCase {
 
     public void testRml_SameNameWithPath() {
-        myFixture.configureByText("A.re", "type t;");
-        myFixture.configureByText("B.re", "type t = A.t<caret>;");
+        configureCode("A.re", "type t;");
+        configureCode("B.re", "type t = A.t<caret>;");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.t", ((PsiQualifiedNamedElement) elementAtCaret.getParent().getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.t", ((PsiQualifiedElement) e.getParent().getParent()).getQualifiedName());
     }
 
     public void testOcl_SameNameWithPath() {
-        myFixture.configureByText("A.ml", "type t");
-        myFixture.configureByText("B.ml", "type t = A.t<caret>");
+        configureCode("A.ml", "type t");
+        configureCode("B.ml", "type t = A.t<caret>");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.t", ((PsiQualifiedNamedElement) elementAtCaret.getParent().getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.t", ((PsiQualifiedElement) e.getParent().getParent()).getQualifiedName());
     }
-
 }
diff --git a/tests/com/reason/ide/reference/ResolveVariantElementTest.java b/tests/com/reason/ide/reference/ResolveVariantElementTest.java
index 4f6365b03..02a60430b 100644
--- a/tests/com/reason/ide/reference/ResolveVariantElementTest.java
+++ b/tests/com/reason/ide/reference/ResolveVariantElementTest.java
@@ -1,18 +1,17 @@
 package com.reason.ide.reference;
 
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiQualifiedNamedElement;
-import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
+import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.lang.core.psi.PsiVariantDeclaration;
 
-public class ResolveVariantElementTest extends LightPlatformCodeInsightFixtureTestCase {
+public class ResolveVariantElementTest extends ORBasePlatformTestCase {
 
     public void testWithAlias() {
         myFixture.configureByText("A.re", "type a = | Variant;");
         myFixture.configureByText("B.re", "type b = | Variant;");
         myFixture.configureByText("C.re", "A.Variant<caret>");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
-        assertEquals("A.a.Variant", ((PsiQualifiedNamedElement) elementAtCaret.getParent()).getQualifiedName());
+        PsiElement e = myFixture.getElementAtCaret();
+        assertEquals("A.a.Variant", ((PsiVariantDeclaration) e.getParent()).getQualifiedName());
     }
-
 }
diff --git a/tests/com/reason/ide/reference/RmlQNameFinderTest.java b/tests/com/reason/ide/reference/RmlQNameFinderTest.java
new file mode 100644
index 000000000..f511cf917
--- /dev/null
+++ b/tests/com/reason/ide/reference/RmlQNameFinderTest.java
@@ -0,0 +1,17 @@
+package com.reason.ide.reference;
+
+import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.ide.files.FileBase;
+import com.reason.lang.reason.RmlQNameFinder;
+
+import java.util.Set;
+
+public class RmlQNameFinderTest extends ORBasePlatformTestCase {
+
+    public void testLetBinding() {
+        FileBase f = configureCode("A.re", "let make = { increase<caret>(); }");
+
+        Set<String> paths = new RmlQNameFinder().extractPotentialPaths(myFixture.getElementAtCaret());
+        assertSameElements(paths, "A.make", "A");
+    }
+}
diff --git a/tests/com/reason/lang/core/ORUtilTest.java b/tests/com/reason/lang/core/ORUtilTest.java
new file mode 100644
index 000000000..1185e6d3e
--- /dev/null
+++ b/tests/com/reason/lang/core/ORUtilTest.java
@@ -0,0 +1,41 @@
+package com.reason.lang.core;
+
+import com.intellij.psi.PsiNameIdentifierOwner;
+import com.reason.ide.ORBasePlatformTestCase;
+import com.reason.ide.files.FileBase;
+import com.reason.lang.core.psi.PsiLet;
+
+public class ORUtilTest extends ORBasePlatformTestCase {
+
+    public void testModuleNameToFileNameWhenEmpty() {
+        assertEquals("", ORUtil.moduleNameToFileName(""));
+    }
+
+    public void testModuleNameToFileName() {
+        assertEquals("testLower", ORUtil.moduleNameToFileName("TestLower"));
+    }
+
+    public void testFileNameToModuleNameWhenEmpty() {
+        assertEquals("", ORUtil.fileNameToModuleName(""));
+        assertEquals("", ORUtil.fileNameToModuleName(".ml"));
+    }
+
+    public void testFileNameToModuleName() {
+        assertEquals("Lower", ORUtil.fileNameToModuleName("lower.ml"));
+        assertEquals("Upper", ORUtil.fileNameToModuleName("Upper.ml"));
+    }
+
+    public void testLetQualifiedName() {
+        configureCode("A.re", "let make = () => { let x<caret> = 1; }");
+
+        String qPath = ORUtil.getQualifiedPath((PsiNameIdentifierOwner) myFixture.getElementAtCaret());
+        assertEquals("A.make", qPath);
+    }
+
+    public void testLetDestructuredQualifiedName() {
+        FileBase f = configureCode("A.re", "module M = { let make = () => { let (x, y) = other; }; }");
+        PsiLet letExpression = f.getLetExpression("(x, y)");
+        String qualifiedPath = ORUtil.getQualifiedPath(letExpression);
+        assertEquals("A.M.make", qualifiedPath);
+    }
+}
\ No newline at end of file
diff --git a/tests/com/reason/lang/core/PsiScopedExprTest.java b/tests/com/reason/lang/core/PsiScopedExprTest.java
index cdacda820..d9ef14b24 100644
--- a/tests/com/reason/lang/core/PsiScopedExprTest.java
+++ b/tests/com/reason/lang/core/PsiScopedExprTest.java
@@ -1,6 +1,7 @@
 package com.reason.lang.core;
 
 import com.reason.lang.BaseParsingTestCase;
+import com.reason.lang.core.psi.PsiDeconstruction;
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiScopedExpr;
 import com.reason.lang.ocaml.OclParserDefinition;
@@ -20,7 +21,7 @@ public void testEmptyScope() {
     public void testNotEmptyScope() {
         PsiLet e = (PsiLet) firstElement(parseCode("let (a, b) = x"));
 
-        assertFalse(ORUtil.findImmediateFirstChildOfClass(e, PsiScopedExpr.class).isEmpty());
+        assertNotNull(ORUtil.findImmediateFirstChildOfClass(e, PsiDeconstruction.class));
     }
 
 }
diff --git a/tests/com/reason/lang/core/PsiUtilTest.java b/tests/com/reason/lang/core/PsiUtilTest.java
deleted file mode 100644
index 8800a172d..000000000
--- a/tests/com/reason/lang/core/PsiUtilTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.reason.lang.core;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class PsiUtilTest {
-
-    @Test
-    public void moduleNameToFileNameWhenEmpty() {
-        assertEquals("", ORUtil.moduleNameToFileName(""));
-    }
-
-    @Test
-    public void moduleNameToFileName() {
-        assertEquals("testLower", ORUtil.moduleNameToFileName("TestLower"));
-    }
-
-    @Test
-    public void fileNameToModuleNameWhenEmpty() {
-        assertEquals("", ORUtil.fileNameToModuleName(""));
-        assertEquals("", ORUtil.fileNameToModuleName(".ml"));
-    }
-
-    @Test
-    public void fileNameToModuleName() {
-        assertEquals("Lower", ORUtil.fileNameToModuleName("lower.ml"));
-        assertEquals("Upper", ORUtil.fileNameToModuleName("Upper.ml"));
-    }
-}
\ No newline at end of file
diff --git a/tests/com/reason/lang/ocaml/LetParsingTest.java b/tests/com/reason/lang/ocaml/LetParsingTest.java
index 47281a6b3..4c05e9ef2 100644
--- a/tests/com/reason/lang/ocaml/LetParsingTest.java
+++ b/tests/com/reason/lang/ocaml/LetParsingTest.java
@@ -1,6 +1,7 @@
 package com.reason.lang.ocaml;
 
 import java.util.*;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.reason.ide.files.FileBase;
@@ -181,4 +182,14 @@ public void testQualifiedName() {
         assertEquals("Dummy.root.inner", inner.getQualifiedName());
         assertEquals("Dummy.M.m", ((PsiLet) mod.getExpressions().iterator().next()).getQualifiedName());
     }
+
+    public void testDeconstruction() {
+        PsiLet e = first(letExpressions(parseCode("let (a, b) = x;")));
+
+        assertTrue(e.isDeconsruction());
+        List<PsiElement> names = e.getDeconstructedElements();
+        assertSize(2, names);
+        assertEquals("a", names.get(0).getText());
+        assertEquals("b", names.get(1).getText());
+    }
 }
diff --git a/tests/com/reason/lang/reason/LetParsingTest.java b/tests/com/reason/lang/reason/LetParsingTest.java
index 7391dab95..2605a0861 100644
--- a/tests/com/reason/lang/reason/LetParsingTest.java
+++ b/tests/com/reason/lang/reason/LetParsingTest.java
@@ -8,7 +8,6 @@
 import com.reason.lang.BaseParsingTestCase;
 import com.reason.lang.core.psi.PsiLet;
 import com.reason.lang.core.psi.PsiLetBinding;
-import com.reason.lang.core.psi.PsiLowerSymbol;
 import com.reason.lang.core.psi.PsiRecord;
 import com.reason.lang.core.signature.ORSignature;
 
@@ -39,7 +38,7 @@ public void testLetBinding() {
     public void testLetBindingWithJsx() {
         PsiFile file = parseCode("let make = p => { render: x => { <div/>; } }");
         PsiElement[] children = file.getChildren();
-        PsiElement element = PsiTreeUtil.nextLeaf(children[1], true);
+        PsiElement element = PsiTreeUtil.nextLeaf(children[1]);
 
         assertNull(element);
         assertSize(1, expressions(file));
@@ -139,16 +138,16 @@ public void testAlias() {
 
     public void testDeconstruction() {
         PsiLet e = first(letExpressions(parseCode("let (a, b) = x;")));
-        List<PsiElement> children = new ArrayList<>(e.getScopeChildren());
 
-        assertEquals("(a, b)", e.getName());
-        assertSize(2, children);
-        assertInstanceOf(children.get(0), PsiLowerSymbol.class);
-        assertInstanceOf(children.get(1), PsiLowerSymbol.class);
+        assertTrue(e.isDeconsruction());
+        List<PsiElement> names = e.getDeconstructedElements();
+        assertSize(2, names);
+        assertEquals("a", names.get(0).getText());
+        assertEquals("b", names.get(1).getText());
     }
 
     public void testOperator() {
-        PsiLet e = first(letExpressions(parseCode("let (/): (path('a, 'b) => 'c, 'd => path('a, 'b), 'd) => 'c;", true)));
+        PsiLet e = first(letExpressions(parseCode("let (/): (path('a, 'b) => 'c, 'd => path('a, 'b), 'd) => 'c;")));
 
         assertEquals("(/)", e.getName());
         ORSignature signature = e.getORSignature();