diff --git a/.idea/modules/vyper-plugin.iml b/.idea/modules/vyper-plugin.iml
index 65d8d90..f30f2db 100644
--- a/.idea/modules/vyper-plugin.iml
+++ b/.idea/modules/vyper-plugin.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="vyper-plugin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="org.vyperlang.plugin" external.system.module.version="0.2.0-alpha.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="vyper-plugin" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="org.vyperlang.plugin" external.system.module.version="0.2.0-alpha.4" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/vyper-plugin.main.iml b/.idea/modules/vyper-plugin.main.iml
index 31c0eb2..00eb738 100644
--- a/.idea/modules/vyper-plugin.main.iml
+++ b/.idea/modules/vyper-plugin.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="vyper-plugin:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="org.vyperlang.plugin" external.system.module.type="sourceSet" external.system.module.version="0.2.0-alpha.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="vyper-plugin:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="org.vyperlang.plugin" external.system.module.type="sourceSet" external.system.module.version="0.2.0-alpha.4" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet external-system-id="GRADLE" type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
@@ -39,6 +39,7 @@
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/kotlin" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/main/gen" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/modules/vyper-plugin.test.iml b/.idea/modules/vyper-plugin.test.iml
index 50446cd..0ef59e5 100644
--- a/.idea/modules/vyper-plugin.test.iml
+++ b/.idea/modules/vyper-plugin.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="vyper-plugin:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="org.vyperlang.plugin" external.system.module.type="sourceSet" external.system.module.version="0.2.0-alpha.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="vyper-plugin:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="org.vyperlang.plugin" external.system.module.type="sourceSet" external.system.module.version="0.2.0-alpha.4" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet external-system-id="GRADLE" type="kotlin-language" name="Kotlin">
       <configuration version="5" platform="JVM 17" allPlatforms="JVM [17]" useProjectSettings="false">
diff --git a/README.md b/README.md
index df59f27..6e19bf4 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ To generate the files, you should have the plugin installed.
 - Run the `Generate Parser Code` task in the `Vyper.bnf` file.
   That generates `VyperParser.java` and `psi` files.
   - When grammar elements are removed, old `psi` files are not deleted automatically.
-    Just delete the whole [`psi` folder](./org/vyperlang/plugin/psi) and regenerate it.
+    Just delete the whole [`psi` folder](./src/main/gen/org/vyperlang/plugin/psi) and regenerate it.
 - Run the `Generate JFlex Lexer` task in the `Vyper.bnf` file.
   That generates `_VyperLexer.flex` file.
 - Run the `Run JFlex Generator` task in the `_VyperLexer.flex` file.
diff --git a/build.gradle b/build.gradle
index e449d78..4ea6ebf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,6 +85,9 @@ compileJava {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
+// Include the generated files in the source set
+sourceSets.main.java.srcDirs 'src/main/gen'
+
 // Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
 kover {
     reports {
diff --git a/src/main/java/org/vyperlang/plugin/grammar/_BaseVyperLexer.java b/src/main/gen/org/vyperlang/plugin/grammar/_BaseVyperLexer.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/grammar/_BaseVyperLexer.java
rename to src/main/gen/org/vyperlang/plugin/grammar/_BaseVyperLexer.java
diff --git a/src/main/java/org/vyperlang/plugin/parser/BaseVyperParser.java b/src/main/gen/org/vyperlang/plugin/parser/BaseVyperParser.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/parser/BaseVyperParser.java
rename to src/main/gen/org/vyperlang/plugin/parser/BaseVyperParser.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperAndExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperAndExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperAndExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperAndExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperAssertExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperAssertExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperAssertExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperAssertExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperAssignmentExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperAssignmentExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperAssignmentExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperAssignmentExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperBinExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperBinExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperBinExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperBinExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperCallExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperCallExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperCallExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperCallExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperClearExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperClearExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperClearExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperClearExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperCompExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperCompExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperCompExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperCompExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperConstantDefinitionExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperConstantDefinitionExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperConstantDefinitionExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperConstantDefinitionExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperEmitStatement.java b/src/main/gen/org/vyperlang/plugin/psi/VyperEmitStatement.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperEmitStatement.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperEmitStatement.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperEqExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperEqExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperEqExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperEqExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperEventDeclaration.java b/src/main/gen/org/vyperlang/plugin/psi/VyperEventDeclaration.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperEventDeclaration.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperEventDeclaration.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperEventLogExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperEventLogExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperEventLogExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperEventLogExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperEventProperty.java b/src/main/gen/org/vyperlang/plugin/psi/VyperEventProperty.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperEventProperty.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperEventProperty.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperExponentExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperExponentExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperExponentExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperExponentExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperExternalInterfaces.java b/src/main/gen/org/vyperlang/plugin/psi/VyperExternalInterfaces.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperExternalInterfaces.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperExternalInterfaces.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperForStatement.java b/src/main/gen/org/vyperlang/plugin/psi/VyperForStatement.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperForStatement.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperForStatement.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunTypeAnnotation.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunTypeAnnotation.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunTypeAnnotation.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunTypeAnnotation.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionArgs.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionArgs.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionArgs.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionArgs.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionBody.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionBody.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionBody.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionBody.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionCallArgument.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionCallArgument.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionCallArgument.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionCallArgument.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionCallArguments.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionCallArguments.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionCallArguments.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionCallArguments.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionCallExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionCallExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionCallExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionCallExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionDecorator.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionDecorator.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionDecorator.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionDecorator.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionDefinition.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionDefinition.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionDefinition.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionDefinition.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionEntrancyKey.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionEntrancyKey.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionEntrancyKey.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionEntrancyKey.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionImplementation.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionImplementation.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionImplementation.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionImplementation.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperFunctionModifier.java b/src/main/gen/org/vyperlang/plugin/psi/VyperFunctionModifier.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperFunctionModifier.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperFunctionModifier.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperIfStatement.java b/src/main/gen/org/vyperlang/plugin/psi/VyperIfStatement.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperIfStatement.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperIfStatement.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperImmutableDefinitionExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperImmutableDefinitionExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperImmutableDefinitionExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperImmutableDefinitionExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperImplementsDirective.java b/src/main/gen/org/vyperlang/plugin/psi/VyperImplementsDirective.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperImplementsDirective.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperImplementsDirective.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperImportPath.java b/src/main/gen/org/vyperlang/plugin/psi/VyperImportPath.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperImportPath.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperImportPath.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperInExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperInExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperInExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperInExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperIndexAccessExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperIndexAccessExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperIndexAccessExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperIndexAccessExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperIndexedData.java b/src/main/gen/org/vyperlang/plugin/psi/VyperIndexedData.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperIndexedData.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperIndexedData.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperInlineArrayExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperInlineArrayExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperInlineArrayExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperInlineArrayExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperListType.java b/src/main/gen/org/vyperlang/plugin/psi/VyperListType.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperListType.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperListType.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperLocalVariableDefinition.java b/src/main/gen/org/vyperlang/plugin/psi/VyperLocalVariableDefinition.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperLocalVariableDefinition.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperLocalVariableDefinition.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperMapType.java b/src/main/gen/org/vyperlang/plugin/psi/VyperMapType.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperMapType.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperMapType.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperMemberAccessExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperMemberAccessExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperMemberAccessExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperMemberAccessExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperMemberIndexAccess.java b/src/main/gen/org/vyperlang/plugin/psi/VyperMemberIndexAccess.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperMemberIndexAccess.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperMemberIndexAccess.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperMultDivExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperMultDivExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperMultDivExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperMultDivExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperMultiLineString.java b/src/main/gen/org/vyperlang/plugin/psi/VyperMultiLineString.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperMultiLineString.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperMultiLineString.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperNewExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperNewExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperNewExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperNewExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperOrExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperOrExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperOrExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperOrExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperParamDef.java b/src/main/gen/org/vyperlang/plugin/psi/VyperParamDef.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperParamDef.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperParamDef.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperParenthesiziedExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperParenthesiziedExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperParenthesiziedExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperParenthesiziedExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperPlusMinExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperPlusMinExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperPlusMinExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperPlusMinExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperPrimaryExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperPrimaryExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperPrimaryExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperPrimaryExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperRangeExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperRangeExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperRangeExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperRangeExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperStateVariableDeclaration.java b/src/main/gen/org/vyperlang/plugin/psi/VyperStateVariableDeclaration.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperStateVariableDeclaration.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperStateVariableDeclaration.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperStateVariableType.java b/src/main/gen/org/vyperlang/plugin/psi/VyperStateVariableType.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperStateVariableType.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperStateVariableType.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperStatement.java b/src/main/gen/org/vyperlang/plugin/psi/VyperStatement.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperStatement.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperStatement.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperStructDefinition.java b/src/main/gen/org/vyperlang/plugin/psi/VyperStructDefinition.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperStructDefinition.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperStructDefinition.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperStructType.java b/src/main/gen/org/vyperlang/plugin/psi/VyperStructType.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperStructType.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperStructType.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperTernaryExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperTernaryExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperTernaryExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperTernaryExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperTupleAssignmentExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperTupleAssignmentExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperTupleAssignmentExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperTupleAssignmentExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperType.java b/src/main/gen/org/vyperlang/plugin/psi/VyperType.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperType.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperType.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperTypes.java b/src/main/gen/org/vyperlang/plugin/psi/VyperTypes.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperTypes.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperTypes.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperUnaryExpression.java b/src/main/gen/org/vyperlang/plugin/psi/VyperUnaryExpression.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperUnaryExpression.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperUnaryExpression.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperValueType.java b/src/main/gen/org/vyperlang/plugin/psi/VyperValueType.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperValueType.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperValueType.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperVarLiteral.java b/src/main/gen/org/vyperlang/plugin/psi/VyperVarLiteral.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperVarLiteral.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperVarLiteral.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/VyperVisitor.java b/src/main/gen/org/vyperlang/plugin/psi/VyperVisitor.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/VyperVisitor.java
rename to src/main/gen/org/vyperlang/plugin/psi/VyperVisitor.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperAndExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperAndExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperAndExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperAndExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperAssertExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperAssertExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperAssertExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperAssertExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperAssignmentExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperAssignmentExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperAssignmentExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperAssignmentExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperBinExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperBinExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperBinExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperBinExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperCallExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperCallExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperCallExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperCallExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperClearExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperClearExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperClearExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperClearExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperCompExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperCompExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperCompExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperCompExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperConstantDefinitionExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperConstantDefinitionExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperConstantDefinitionExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperConstantDefinitionExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperEmitStatementImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEmitStatementImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperEmitStatementImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperEmitStatementImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperEqExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEqExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperEqExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperEqExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperEventDeclarationImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventDeclarationImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperEventDeclarationImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventDeclarationImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperEventLogExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventLogExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperEventLogExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventLogExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperEventPropertyImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventPropertyImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperEventPropertyImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperEventPropertyImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperExponentExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperExponentExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperExponentExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperExponentExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperExternalInterfacesImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperExternalInterfacesImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperExternalInterfacesImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperExternalInterfacesImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperForStatementImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperForStatementImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperForStatementImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperForStatementImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunTypeAnnotationImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunTypeAnnotationImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunTypeAnnotationImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunTypeAnnotationImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionArgsImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionArgsImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionArgsImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionArgsImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionBodyImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionBodyImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionBodyImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionBodyImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentsImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentsImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentsImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionCallArgumentsImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionCallExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionCallExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionCallExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionCallExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionDecoratorImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionDecoratorImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionDecoratorImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionDecoratorImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionDefinitionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionDefinitionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionDefinitionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionEntrancyKeyImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionEntrancyKeyImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionEntrancyKeyImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionEntrancyKeyImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionImplementationImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionImplementationImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionImplementationImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionImplementationImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionModifierImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionModifierImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperFunctionModifierImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperFunctionModifierImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperIfStatementImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperIfStatementImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperIfStatementImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperIfStatementImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperImmutableDefinitionExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperImmutableDefinitionExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperImmutableDefinitionExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperImmutableDefinitionExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperImplementsDirectiveImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperImplementsDirectiveImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperImplementsDirectiveImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperImplementsDirectiveImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperImportPathImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperImportPathImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperImportPathImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperImportPathImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperInExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperInExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperInExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperInExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperIndexAccessExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperIndexAccessExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperIndexAccessExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperIndexAccessExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperIndexedDataImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperIndexedDataImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperIndexedDataImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperIndexedDataImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperInlineArrayExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperInlineArrayExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperInlineArrayExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperInlineArrayExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperListTypeImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperListTypeImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperListTypeImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperListTypeImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperLocalVariableDefinitionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperLocalVariableDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperLocalVariableDefinitionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperLocalVariableDefinitionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperMapTypeImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperMapTypeImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperMapTypeImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperMapTypeImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperMemberAccessExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperMemberAccessExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperMemberAccessExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperMemberAccessExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperMemberIndexAccessImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperMemberIndexAccessImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperMemberIndexAccessImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperMemberIndexAccessImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperMultDivExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperMultDivExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperMultDivExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperMultDivExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperMultiLineStringImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperMultiLineStringImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperMultiLineStringImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperMultiLineStringImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperNewExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperNewExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperNewExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperNewExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperOrExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperOrExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperOrExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperOrExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperParamDefImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperParamDefImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperParamDefImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperParamDefImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperParenthesiziedExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperParenthesiziedExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperParenthesiziedExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperParenthesiziedExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperPlusMinExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperPlusMinExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperPlusMinExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperPlusMinExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperPrimaryExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperPrimaryExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperPrimaryExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperPrimaryExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperRangeExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperRangeExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperRangeExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperRangeExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperStateVariableDeclarationImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperStateVariableDeclarationImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperStateVariableDeclarationImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperStateVariableDeclarationImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperStateVariableTypeImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperStateVariableTypeImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperStateVariableTypeImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperStateVariableTypeImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperStatementImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperStatementImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperStatementImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperStatementImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperStructDefinitionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperStructDefinitionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperStructDefinitionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperStructDefinitionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperStructTypeImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperStructTypeImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperStructTypeImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperStructTypeImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperTernaryExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperTernaryExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperTernaryExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperTernaryExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperTupleAssignmentExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperTupleAssignmentExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperTupleAssignmentExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperTupleAssignmentExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperTypeImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperTypeImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperTypeImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperTypeImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperUnaryExpressionImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperUnaryExpressionImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperUnaryExpressionImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperUnaryExpressionImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperValueTypeImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperValueTypeImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperValueTypeImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperValueTypeImpl.java
diff --git a/src/main/java/org/vyperlang/plugin/psi/impl/VyperVarLiteralImpl.java b/src/main/gen/org/vyperlang/plugin/psi/impl/VyperVarLiteralImpl.java
similarity index 100%
rename from src/main/java/org/vyperlang/plugin/psi/impl/VyperVarLiteralImpl.java
rename to src/main/gen/org/vyperlang/plugin/psi/impl/VyperVarLiteralImpl.java
diff --git a/src/main/kotlin/org/vyperlang/plugin/Highligther.kt b/src/main/kotlin/org/vyperlang/plugin/Highligther.kt
index ce1de37..3fd1e31 100644
--- a/src/main/kotlin/org/vyperlang/plugin/Highligther.kt
+++ b/src/main/kotlin/org/vyperlang/plugin/Highligther.kt
@@ -77,7 +77,7 @@ class VyperHighlighter : SyntaxHighlighterBase() {
         )
 
         private fun modificators() = setOf<IElementType>(
-            PUBLIC, NONREENTRANT, EXTERNAL, INTERNAL, VIEW, PURE, IMMUTABLE, CONSTANT,
+            PUBLIC, NONREENTRANT, EXTERNAL, INTERNAL, IMMUTABLE, CONSTANT,
             // todo: the following are (also) for interfaces
             PAYABLE, NONPAYABLE, VIEW, PURE,
         )
diff --git a/src/main/kotlin/org/vyperlang/plugin/psi/Mixins.kt b/src/main/kotlin/org/vyperlang/plugin/psi/Mixins.kt
index 1d3383b..551dd7d 100644
--- a/src/main/kotlin/org/vyperlang/plugin/psi/Mixins.kt
+++ b/src/main/kotlin/org/vyperlang/plugin/psi/Mixins.kt
@@ -4,6 +4,9 @@ package org.vyperlang.plugin.psi
 import com.intellij.lang.ASTNode
 import com.intellij.openapi.util.IconLoader
 import com.intellij.psi.PsiElement
+import com.intellij.psi.util.childrenOfType
+import com.intellij.psi.util.parentOfType
+import org.mozilla.javascript.ast.FunctionCall
 import org.vyperlang.plugin.psi.VyperTypes.*
 import org.vyperlang.plugin.psi.impl.VyperCallExpressionImpl
 import org.vyperlang.plugin.references.VyperCallReference
@@ -18,7 +21,17 @@ abstract class VyperVarLiteralMixin(node: ASTNode) : VyperNamedElementImpl(node)
     override fun getReference(): VyperReference {
         val parent = node.psi.parent
         val grandparent = parent.parent
+        val greatGrandparent = grandparent.parent
         return when {
+            greatGrandparent is VyperFunctionCallArgument && parent.firstChild == node.psi -> {
+                val structName = greatGrandparent.parentOfType<VyperCallExpression>()?.childOfType<VyperVarLiteral>()?.text
+                val structPsi =
+                    node.psi.file.childrenOfType<VyperStructDefinition>()
+                        .first { it.localVariableDefinition?.identifier?.text == structName }
+                        ?.childOfType<VyperIdentifier>()
+                        .first { it.text == this.text }
+                VyperVarLiteralReference(structPsi)
+            }
             grandparent is VyperCallExpressionImpl && parent is VyperMemberAccessExpression ->
                 VyperMemberAccessReference(this, parent)
             parent is VyperMemberAccessExpression && parent.varLiteral == node.psi ->
diff --git a/src/main/kotlin/org/vyperlang/plugin/references/Resolver.kt b/src/main/kotlin/org/vyperlang/plugin/references/Resolver.kt
index d07276e..a99ad11 100644
--- a/src/main/kotlin/org/vyperlang/plugin/references/Resolver.kt
+++ b/src/main/kotlin/org/vyperlang/plugin/references/Resolver.kt
@@ -1,9 +1,7 @@
 package org.vyperlang.plugin.references
 
 import com.intellij.psi.PsiElement
-import com.intellij.psi.util.childrenOfType
 import com.intellij.psi.util.isAncestor
-import net.sf.cglib.core.Local
 import org.vyperlang.plugin.psi.*
 import org.vyperlang.plugin.psi.VyperTypes.VAR_LITERAL
 
@@ -26,16 +24,13 @@ object VyperResolver {
 //        return newList
 //    }
 
-    private fun lexicalDeclRec(place: PsiElement, stop: (PsiElement) -> Boolean): List<VyperNamedElement> {
-        val found = place.ancestors
+    private fun lexicalDeclRec(place: PsiElement, stop: (PsiElement) -> Boolean): List<VyperNamedElement> =
+        place.ancestors
             .drop(1) // current element might not be a VyperElement
             .takeWhile { (it is VyperElement || it is VyperFile) && !stop(it) }
             .flatMap { lexicalDeclarations(it, place) }
+            .filter { !it.isAncestor(place) } // don't suggest the element being defined
             .toList()
-        val filtered = found
-        .filter { !it.isAncestor(place) } // don't suggest the element being defined
-        return filtered
-    }
 
     private fun lexicalDeclarations(scope: PsiElement, place: PsiElement): List<VyperNamedElement> = when (scope) {
         is VyperLocalVariableDefinition -> listOf(scope)
diff --git a/src/main/kotlin/org/vyperlang/plugin/references/VyperUserDefinedReferences.kt b/src/main/kotlin/org/vyperlang/plugin/references/VyperUserDefinedReferences.kt
index ca530b5..71c905f 100644
--- a/src/main/kotlin/org/vyperlang/plugin/references/VyperUserDefinedReferences.kt
+++ b/src/main/kotlin/org/vyperlang/plugin/references/VyperUserDefinedReferences.kt
@@ -40,3 +40,14 @@ class VyperCallReference(element: VyperCallElement) : VyperReferenceBase<VyperCa
         return resolveFunctionCall().map { it.psiElement }
     }
 }
+
+class VyperStructMemberReference(element: VyperCallElement) : VyperReferenceBase<VyperCallElement>(element), VyperReference {
+
+    private fun resolveFunctionCall(): Collection<FunctionResolveResult> {
+        return VyperResolver.resolveFunction(element)
+    }
+
+    override fun multiResolve(): Collection<PsiElement> {
+        return resolveFunctionCall().map { it.psiElement }
+    }
+}