From cbdbebf9083687ed5d8523744df62c039da2747d Mon Sep 17 00:00:00 2001
From: Szasza Palmer <szasza@szasza.info>
Date: Mon, 3 Feb 2025 21:35:33 +1100
Subject: [PATCH] upgrading gradle-intellij-plugin to v2, generalising package
 namespace (#62)

* upgrading grade-intellij-plugin to v2, generalising package namespace

* updating gradle command for release listing

* fixing test package name

* updating changelog

* upgrading Gradle to v8.12, plugging in Qodana Cloud

* upgrading Qodana linter

* resolving code inspection issues, restricting versions to 241.*

* fixing LSP startup, Qodana finding cleanup

* reverting accidental plugin ID change

* upgrading supported upper version, adding missing query result attributes, upgrading ktor
---
 .github/dependabot.yml                        |    2 +
 .github/workflows/build.yml                   |  125 +-
 .github/workflows/release.yml                 |   22 +-
 .github/workflows/run-ui-tests.yml            |   14 +-
 .gitignore                                    |    1 +
 .idea/gradle.xml                              |    2 +
 .run/Run Qodana.run.xml                       |    8 +-
 .run/Run Verifications.run.xml                |    2 +-
 CHANGELOG.md                                  |   16 +-
 README.md                                     |    4 +-
 build.gradle.kts                              |  177 +--
 .../wingidea/lang/parser/WingParser.java      |    6 +-
 .../wingidea/lang/parser/_WingLexer.java      |    4 +-
 .../wingidea/lang/parser/_WingLexer.java~     | 1023 +++++++++++++++++
 .../wingidea/lang/psi/WingAccessModifier.java |    2 +-
 .../wingidea/lang/psi/WingAccessor.java       |    2 +-
 .../wingidea/lang/psi/WingArgument.java       |    2 +-
 .../wingidea/lang/psi/WingArgumentList.java   |    2 +-
 .../lang/psi/WingArrayLiteralExpression.java  |    2 +-
 .../lang/psi/WingAwaitExpression.java         |    2 +-
 .../lang/psi/WingBinaryExpression.java        |    2 +-
 .../wingidea/lang/psi/WingBlockStatement.java |    2 +-
 .../wingidea/lang/psi/WingBreakStatement.java |    2 +-
 .../wingidea/lang/psi/WingCallExpression.java |    2 +-
 .../wingidea/lang/psi/WingCatchBlock.java     |    2 +-
 .../psi/WingClassDefinitionStatement.java     |    2 +-
 .../wingidea/lang/psi/WingClassField.java     |    2 +-
 .../lang/psi/WingClassImplementation.java     |    2 +-
 .../psi/WingCollectionLiteralExpression.java  |    2 +-
 .../lang/psi/WingContainerValueType.java      |    2 +-
 .../lang/psi/WingContinueStatement.java       |    2 +-
 .../lang/psi/WingDeferExpression.java         |    2 +-
 .../wingidea/lang/psi/WingDuration.java       |    2 +-
 .../wingidea/lang/psi/WingElIfBlock.java      |    2 +-
 .../wingidea/lang/psi/WingElementTypes.java   |    4 +-
 .../lang/psi/WingEnumDefinitionStatement.java |    2 +-
 .../wingidea/lang/psi/WingEnumField.java      |    2 +-
 .../wingidea/lang/psi/WingExpression.java     |    2 +-
 .../lang/psi/WingExpressionStatement.java     |    2 +-
 .../wingidea/lang/psi/WingExternModifier.java |    2 +-
 .../wingidea/lang/psi/WingFinallyBlock.java   |    2 +-
 .../lang/psi/WingForInLoopStatement.java      |    2 +-
 .../wingidea/lang/psi/WingFunctionType.java   |    2 +-
 .../wingidea/lang/psi/WingIfLetStatement.java |    2 +-
 .../wingidea/lang/psi/WingIfStatement.java    |    2 +-
 .../lang/psi/WingImportStatement.java         |    2 +-
 .../lang/psi/WingImportStatementBlock.java    |    2 +-
 .../psi/WingInflightClosureExpression.java    |    2 +-
 .../psi/WingInflightMethodDefinition.java     |    2 +-
 .../lang/psi/WingInflightMethodSignature.java |    2 +-
 .../wingidea/lang/psi/WingInitializer.java    |    2 +-
 .../psi/WingInterfaceDefinitionStatement.java |    2 +-
 .../lang/psi/WingInterfaceImplementation.java |    2 +-
 .../lang/psi/WingJsonLiteralExpression.java   |    2 +-
 .../wingidea/lang/psi/WingJsonMapLiteral.java |    2 +-
 .../lang/psi/WingJsonMapLiteralMember.java    |    2 +-
 .../lang/psi/WingLiteralExpression.java       |    2 +-
 .../lang/psi/WingLogicalOperators.java        |    2 +-
 .../wingidea/lang/psi/WingLoopRange.java      |    2 +-
 .../lang/psi/WingMapLiteralExpression.java    |    2 +-
 .../lang/psi/WingMapLiteralMember.java        |    2 +-
 .../lang/psi/WingMathematicalOperators.java   |    2 +-
 .../lang/psi/WingMethodDefinition.java        |    2 +-
 .../lang/psi/WingMethodSignature.java         |    2 +-
 .../psi/WingNestedIdentifierExpression.java   |    2 +-
 .../WingNestedIdentifierJsonExpression.java   |    2 +-
 .../wingidea/lang/psi/WingNewExpression.java  |    2 +-
 .../wingidea/lang/psi/WingNumber.java         |    2 +-
 .../wingidea/lang/psi/WingOperators.java      |    2 +-
 .../lang/psi/WingOptionalTestExpression.java  |    2 +-
 .../lang/psi/WingParameterDefinition.java     |    2 +-
 .../wingidea/lang/psi/WingParameterList.java  |    2 +-
 .../lang/psi/WingParameterTypeList.java       |    2 +-
 .../lang/psi/WingParenthesizedExpression.java |    2 +-
 .../psi/WingPreflightClosureExpression.java   |    2 +-
 .../lang/psi/WingReferenceExpression.java     |    2 +-
 .../lang/psi/WingRelationalOperators.java     |    2 +-
 .../psi/WingResourceDefinitionStatement.java  |    2 +-
 .../lang/psi/WingResourceImplementation.java  |    2 +-
 .../lang/psi/WingReturnStatement.java         |    2 +-
 .../lang/psi/WingSetLiteralExpression.java    |    2 +-
 .../wingidea/lang/psi/WingString.java         |    2 +-
 .../psi/WingStructDefinitionStatement.java    |    2 +-
 .../wingidea/lang/psi/WingStructField.java    |    2 +-
 .../lang/psi/WingStructLiteralExpression.java |    2 +-
 .../lang/psi/WingStructLiteralMember.java     |    2 +-
 .../psi/WingStructuredAccessExpression.java   |    2 +-
 .../lang/psi/WingSuperCallExpression.java     |    2 +-
 .../psi/WingSuperConstructorStatement.java    |    2 +-
 .../wingidea/lang/psi/WingTestStatement.java  |    2 +-
 .../lang/psi/WingTryCatchStatement.java       |    2 +-
 .../wingidea/lang/psi/WingType.java           |    2 +-
 .../wingidea/lang/psi/WingTypeAnnotation.java |    2 +-
 .../lang/psi/WingUnaryExpression.java         |    2 +-
 .../wingidea/lang/psi/WingUnaryOperators.java |    2 +-
 .../psi/WingVariableAssignmentStatement.java  |    2 +-
 .../psi/WingVariableDefinitionStatement.java  |    2 +-
 .../wingidea/lang/psi/WingVisitor.java        |    2 +-
 .../wingidea/lang/psi/WingWhileStatement.java |    2 +-
 .../lang/psi/impl/WingAccessModifierImpl.java |    6 +-
 .../lang/psi/impl/WingAccessorImpl.java       |    6 +-
 .../lang/psi/impl/WingArgumentImpl.java       |    6 +-
 .../lang/psi/impl/WingArgumentListImpl.java   |    6 +-
 .../impl/WingArrayLiteralExpressionImpl.java  |    6 +-
 .../psi/impl/WingAwaitExpressionImpl.java     |    6 +-
 .../psi/impl/WingBinaryExpressionImpl.java    |    6 +-
 .../lang/psi/impl/WingBlockStatementImpl.java |    6 +-
 .../lang/psi/impl/WingBreakStatementImpl.java |    6 +-
 .../lang/psi/impl/WingCallExpressionImpl.java |    6 +-
 .../lang/psi/impl/WingCatchBlockImpl.java     |    6 +-
 .../WingClassDefinitionStatementImpl.java     |    6 +-
 .../lang/psi/impl/WingClassFieldImpl.java     |    6 +-
 .../psi/impl/WingClassImplementationImpl.java |    6 +-
 .../WingCollectionLiteralExpressionImpl.java  |    6 +-
 .../psi/impl/WingContainerValueTypeImpl.java  |    6 +-
 .../psi/impl/WingContinueStatementImpl.java   |    6 +-
 .../psi/impl/WingDeferExpressionImpl.java     |    6 +-
 .../lang/psi/impl/WingDurationImpl.java       |    6 +-
 .../lang/psi/impl/WingElIfBlockImpl.java      |    6 +-
 .../impl/WingEnumDefinitionStatementImpl.java |    6 +-
 .../lang/psi/impl/WingEnumFieldImpl.java      |    6 +-
 .../lang/psi/impl/WingExpressionImpl.java     |    6 +-
 .../psi/impl/WingExpressionStatementImpl.java |    6 +-
 .../lang/psi/impl/WingExternModifierImpl.java |    6 +-
 .../lang/psi/impl/WingFinallyBlockImpl.java   |    6 +-
 .../psi/impl/WingForInLoopStatementImpl.java  |    6 +-
 .../lang/psi/impl/WingFunctionTypeImpl.java   |    6 +-
 .../lang/psi/impl/WingIfLetStatementImpl.java |    6 +-
 .../lang/psi/impl/WingIfStatementImpl.java    |    6 +-
 .../impl/WingImportStatementBlockImpl.java    |    6 +-
 .../psi/impl/WingImportStatementImpl.java     |    6 +-
 .../WingInflightClosureExpressionImpl.java    |    6 +-
 .../WingInflightMethodDefinitionImpl.java     |    6 +-
 .../impl/WingInflightMethodSignatureImpl.java |    6 +-
 .../lang/psi/impl/WingInitializerImpl.java    |    6 +-
 .../WingInterfaceDefinitionStatementImpl.java |    6 +-
 .../impl/WingInterfaceImplementationImpl.java |    6 +-
 .../impl/WingJsonLiteralExpressionImpl.java   |    6 +-
 .../lang/psi/impl/WingJsonMapLiteralImpl.java |    6 +-
 .../impl/WingJsonMapLiteralMemberImpl.java    |    6 +-
 .../psi/impl/WingLiteralExpressionImpl.java   |    6 +-
 .../psi/impl/WingLogicalOperatorsImpl.java    |    6 +-
 .../lang/psi/impl/WingLoopRangeImpl.java      |    6 +-
 .../impl/WingMapLiteralExpressionImpl.java    |    6 +-
 .../psi/impl/WingMapLiteralMemberImpl.java    |    6 +-
 .../impl/WingMathematicalOperatorsImpl.java   |    6 +-
 .../psi/impl/WingMethodDefinitionImpl.java    |    6 +-
 .../psi/impl/WingMethodSignatureImpl.java     |    6 +-
 .../WingNestedIdentifierExpressionImpl.java   |    6 +-
 ...ingNestedIdentifierJsonExpressionImpl.java |    6 +-
 .../lang/psi/impl/WingNewExpressionImpl.java  |    6 +-
 .../lang/psi/impl/WingNumberImpl.java         |    6 +-
 .../lang/psi/impl/WingOperatorsImpl.java      |    6 +-
 .../impl/WingOptionalTestExpressionImpl.java  |    6 +-
 .../psi/impl/WingParameterDefinitionImpl.java |    6 +-
 .../lang/psi/impl/WingParameterListImpl.java  |    6 +-
 .../psi/impl/WingParameterTypeListImpl.java   |    6 +-
 .../impl/WingParenthesizedExpressionImpl.java |    6 +-
 .../WingPreflightClosureExpressionImpl.java   |    6 +-
 .../psi/impl/WingReferenceExpressionImpl.java |    6 +-
 .../psi/impl/WingRelationalOperatorsImpl.java |    6 +-
 .../WingResourceDefinitionStatementImpl.java  |    6 +-
 .../impl/WingResourceImplementationImpl.java  |    6 +-
 .../psi/impl/WingReturnStatementImpl.java     |    6 +-
 .../impl/WingSetLiteralExpressionImpl.java    |    6 +-
 .../lang/psi/impl/WingStringImpl.java         |    6 +-
 .../WingStructDefinitionStatementImpl.java    |    6 +-
 .../lang/psi/impl/WingStructFieldImpl.java    |    6 +-
 .../impl/WingStructLiteralExpressionImpl.java |    6 +-
 .../psi/impl/WingStructLiteralMemberImpl.java |    6 +-
 .../WingStructuredAccessExpressionImpl.java   |    6 +-
 .../psi/impl/WingSuperCallExpressionImpl.java |    6 +-
 .../WingSuperConstructorStatementImpl.java    |    6 +-
 .../lang/psi/impl/WingTestStatementImpl.java  |    6 +-
 .../psi/impl/WingTryCatchStatementImpl.java   |    6 +-
 .../lang/psi/impl/WingTypeAnnotationImpl.java |    6 +-
 .../wingidea/lang/psi/impl/WingTypeImpl.java  |    6 +-
 .../psi/impl/WingUnaryExpressionImpl.java     |    6 +-
 .../lang/psi/impl/WingUnaryOperatorsImpl.java |    6 +-
 .../WingVariableAssignmentStatementImpl.java  |    6 +-
 .../WingVariableDefinitionStatementImpl.java  |    6 +-
 .../lang/psi/impl/WingWhileStatementImpl.java |    6 +-
 gradle.properties                             |   16 +-
 gradle/libs.versions.toml                     |    8 +-
 gradle/wrapper/gradle-wrapper.properties      |    2 +-
 gradlew                                       |   22 +-
 gradlew.bat                                   |   22 +-
 grammars/Wing.bnf                             |   18 +-
 grammars/Wing.flex                            |    4 +-
 qodana.yml                                    |    2 +-
 settings.gradle.kts                           |    4 +
 .../wingidea/lang/WingLanguage.kt             |    6 -
 .../wingidea/VirtualFileExtensions.kt         |    2 +-
 .../{olivernybroe => }/wingidea/WingBundle.kt |    2 +-
 .../{olivernybroe => }/wingidea/WingIcons.kt  |    2 +-
 .../wingidea/ide/WingCommandLine.kt           |   19 +-
 .../wingidea/ide/WingFileChangedListener.kt   |   15 +-
 .../wingidea/ide/editor/WingBraceMatcher.kt   |    4 +-
 .../wingidea/ide/editor/WingCommenter.kt      |    2 +-
 .../wingidea/ide/editor/WingQuoteHandler.kt   |    4 +-
 .../ide/folding/WingBlockFoldingBuilder.kt    |    6 +-
 .../ide/folding/WingImportFoldingBuilder.kt   |    4 +-
 .../wingidea/ide/formatter/WingFormatBlock.kt |    2 +-
 .../formatter/WingFormattingModelBuilder.kt   |    2 +-
 .../WingLanguageCodeStyleSettingsProvider.kt  |    4 +-
 .../ide/highlighting/WingColorSettingsPage.kt |    8 +-
 .../wingidea/ide/highlighting/WingColors.kt   |    2 +-
 .../highlighting/WingHighlightAnnotator.kt    |    9 +-
 .../ide/highlighting/WingSyntaxHighlighter.kt |    8 +-
 .../WingSyntaxHighlighterFactory.kt           |    2 +-
 .../ide/lsp/WingLspServerSupportProvider.kt   |    9 +-
 .../ide/services/WingConsoleListener.kt       |    2 +-
 .../ide/services/WingConsoleManager.kt        |   17 +-
 .../servicesWindow/AddWingConnectionAction.kt |    2 +-
 .../ide/servicesWindow/WingServerType.kt      |   12 +-
 .../WingConsoleExplorerToolWindowFactory.kt   |    6 +-
 .../WingConsoleMapToolWindowFactory.kt        |    6 +-
 .../wingidea/lang/WingFileType.kt             |    4 +-
 .../com/github/wingidea/lang/WingLanguage.kt  |    7 +
 .../wingidea/lang/lexer/WingLexer.kt          |    4 +-
 .../lang/parser/WingParserDefinition.kt       |    6 +-
 .../wingidea/lang/parser/WingParserUtil.kt    |    6 +-
 .../wingidea/lang/psi/WingElement.kt          |    2 +-
 .../wingidea/lang/psi/WingElementType.kt      |    4 +-
 .../wingidea/lang/psi/WingFile.kt             |    6 +-
 .../wingidea/lang/psi/WingFileElementType.kt  |    4 +-
 .../wingidea/lang/psi/WingTokenType.kt        |    6 +-
 .../wingidea/lang/psi/impl/WingElementImpl.kt |    4 +-
 src/main/resources/META-INF/plugin.xml        |   36 +-
 .../wingidea/lang/lexer/WingLexerTest.kt      |    2 +-
 .../lang/lexer/WingStructParsingTest.kt       |    4 +-
 231 files changed, 1743 insertions(+), 683 deletions(-)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/parser/WingParser.java (99%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/parser/_WingLexer.java (99%)
 create mode 100644 gen/com/github/wingidea/lang/parser/_WingLexer.java~
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingAccessModifier.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingAccessor.java (80%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingArgument.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingArgumentList.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingArrayLiteralExpression.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingAwaitExpression.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingBinaryExpression.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingBlockStatement.java (97%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingBreakStatement.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingCallExpression.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingCatchBlock.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingClassDefinitionStatement.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingClassField.java (89%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingClassImplementation.java (90%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingCollectionLiteralExpression.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingContainerValueType.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingContinueStatement.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingDeferExpression.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingDuration.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingElIfBlock.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingElementTypes.java (99%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingEnumDefinitionStatement.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingEnumField.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingExpression.java (80%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingExpressionStatement.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingExternModifier.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingFinallyBlock.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingForInLoopStatement.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingFunctionType.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingIfLetStatement.java (89%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingIfStatement.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingImportStatement.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingImportStatementBlock.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingInflightClosureExpression.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingInflightMethodDefinition.java (91%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingInflightMethodSignature.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingInitializer.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingInterfaceDefinitionStatement.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingInterfaceImplementation.java (89%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingJsonLiteralExpression.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingJsonMapLiteral.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingJsonMapLiteralMember.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingLiteralExpression.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingLogicalOperators.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingLoopRange.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingMapLiteralExpression.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingMapLiteralMember.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingMathematicalOperators.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingMethodDefinition.java (91%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingMethodSignature.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingNestedIdentifierExpression.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingNestedIdentifierJsonExpression.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingNewExpression.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingNumber.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingOperators.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingOptionalTestExpression.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingParameterDefinition.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingParameterList.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingParameterTypeList.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingParenthesizedExpression.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingPreflightClosureExpression.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingReferenceExpression.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingRelationalOperators.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingResourceDefinitionStatement.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingResourceImplementation.java (90%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingReturnStatement.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingSetLiteralExpression.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingString.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingStructDefinitionStatement.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingStructField.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingStructLiteralExpression.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingStructLiteralMember.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingStructuredAccessExpression.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingSuperCallExpression.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingSuperConstructorStatement.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingTestStatement.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingTryCatchStatement.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingType.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingTypeAnnotation.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingUnaryExpression.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingUnaryOperators.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingVariableAssignmentStatement.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingVariableDefinitionStatement.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingVisitor.java (99%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/WingWhileStatement.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingAccessModifierImpl.java (79%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingAccessorImpl.java (79%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingArgumentImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingArgumentListImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingArrayLiteralExpressionImpl.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingAwaitExpressionImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingBinaryExpressionImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingBlockStatementImpl.java (95%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingBreakStatementImpl.java (79%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingCallExpressionImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingCatchBlockImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingClassDefinitionStatementImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingClassFieldImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingClassImplementationImpl.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingCollectionLiteralExpressionImpl.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingContainerValueTypeImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingContinueStatementImpl.java (80%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingDeferExpressionImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingDurationImpl.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingElIfBlockImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingEnumDefinitionStatementImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingEnumFieldImpl.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingExpressionImpl.java (79%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingExpressionStatementImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingExternModifierImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingFinallyBlockImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingForInLoopStatementImpl.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingFunctionTypeImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingIfLetStatementImpl.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingIfStatementImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingImportStatementBlockImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingImportStatementImpl.java (79%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingInflightClosureExpressionImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingInflightMethodDefinitionImpl.java (89%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingInflightMethodSignatureImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingInitializerImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingInterfaceDefinitionStatementImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingInterfaceImplementationImpl.java (87%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingJsonLiteralExpressionImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingJsonMapLiteralImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingJsonMapLiteralMemberImpl.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingLiteralExpressionImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingLogicalOperatorsImpl.java (79%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingLoopRangeImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingMapLiteralExpressionImpl.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingMapLiteralMemberImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingMathematicalOperatorsImpl.java (80%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingMethodDefinitionImpl.java (89%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingMethodSignatureImpl.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingNestedIdentifierExpressionImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingNestedIdentifierJsonExpressionImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingNewExpressionImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingNumberImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingOperatorsImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingOptionalTestExpressionImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingParameterDefinitionImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingParameterListImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingParameterTypeListImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingParenthesizedExpressionImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingPreflightClosureExpressionImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingReferenceExpressionImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingRelationalOperatorsImpl.java (80%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingResourceDefinitionStatementImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingResourceImplementationImpl.java (88%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingReturnStatementImpl.java (82%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingSetLiteralExpressionImpl.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingStringImpl.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingStructDefinitionStatementImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingStructFieldImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingStructLiteralExpressionImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingStructLiteralMemberImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingStructuredAccessExpressionImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingSuperCallExpressionImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingSuperConstructorStatementImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingTestStatementImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingTryCatchStatementImpl.java (85%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingTypeAnnotationImpl.java (81%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingTypeImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingUnaryExpressionImpl.java (84%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingUnaryOperatorsImpl.java (79%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingVariableAssignmentStatementImpl.java (83%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingVariableDefinitionStatementImpl.java (86%)
 rename gen/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingWhileStatementImpl.java (84%)
 delete mode 100644 src/main/kotlin/com/github/olivernybroe/wingidea/lang/WingLanguage.kt
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/VirtualFileExtensions.kt (76%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/WingBundle.kt (93%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/WingIcons.kt (79%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/WingCommandLine.kt (67%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/WingFileChangedListener.kt (66%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/editor/WingBraceMatcher.kt (89%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/editor/WingCommenter.kt (87%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/editor/WingQuoteHandler.kt (54%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/folding/WingBlockFoldingBuilder.kt (81%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/folding/WingImportFoldingBuilder.kt (87%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/formatter/WingFormatBlock.kt (90%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/formatter/WingFormattingModelBuilder.kt (92%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/formatter/settings/WingLanguageCodeStyleSettingsProvider.kt (92%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/highlighting/WingColorSettingsPage.kt (94%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/highlighting/WingColors.kt (97%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/highlighting/WingHighlightAnnotator.kt (87%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/highlighting/WingSyntaxHighlighter.kt (85%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/highlighting/WingSyntaxHighlighterFactory.kt (89%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/lsp/WingLspServerSupportProvider.kt (89%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/services/WingConsoleListener.kt (87%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/services/WingConsoleManager.kt (94%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/servicesWindow/AddWingConnectionAction.kt (89%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/servicesWindow/WingServerType.kt (93%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/toolWindow/WingConsoleExplorerToolWindowFactory.kt (95%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/ide/toolWindow/WingConsoleMapToolWindowFactory.kt (93%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/WingFileType.kt (75%)
 create mode 100644 src/main/kotlin/com/github/wingidea/lang/WingLanguage.kt
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/lexer/WingLexer.kt (64%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/parser/WingParserDefinition.kt (86%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/parser/WingParserUtil.kt (89%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/psi/WingElement.kt (71%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/psi/WingElementType.kt (62%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/psi/WingFile.kt (66%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/psi/WingFileElementType.kt (52%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/psi/WingTokenType.kt (80%)
 rename src/main/kotlin/com/github/{olivernybroe => }/wingidea/lang/psi/impl/WingElementImpl.kt (65%)
 rename src/test/kotlin/com/github/{olivernybroe => }/wingidea/lang/lexer/WingLexerTest.kt (90%)
 rename src/test/kotlin/com/github/{olivernybroe => }/wingidea/lang/lexer/WingStructParsingTest.kt (73%)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index fe30e00..9be205f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,10 +6,12 @@ updates:
   # Maintain dependencies for Gradle dependencies
   - package-ecosystem: "gradle"
     directory: "/"
+    target-branch: "next"
     schedule:
       interval: "daily"
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: "next"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b73a39..5cf636a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,12 +1,12 @@
 # GitHub Actions Workflow is created for testing and preparing the plugin release in the following steps:
-# - validate Gradle Wrapper,
-# - run 'test' and 'verifyPlugin' tasks,
-# - run Qodana inspections,
-# - run 'buildPlugin' task and prepare artifact for the further tests,
-# - run 'runPluginVerifier' task,
-# - create a draft release.
+# - Validate Gradle Wrapper.
+# - Run 'test' and 'verifyPlugin' tasks.
+# - Run Qodana inspections.
+# - Run the 'buildPlugin' task and prepare artifact for further tests.
+# - Run the 'runPluginVerifier' task.
+# - Create a draft release.
 #
-# Workflow is triggered on push and pull_request events.
+# The workflow is triggered on push and pull_request events.
 #
 # GitHub Actions reference: https://help.github.com/en/actions
 #
@@ -14,49 +14,39 @@
 
 name: Build
 on:
-  # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
+  # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g., for dependabot pull requests)
   push:
     branches: [ main ]
   # Trigger the workflow on any pull request
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
 
   # Prepare environment and build the plugin
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       version: ${{ steps.properties.outputs.version }}
       changelog: ${{ steps.properties.outputs.changelog }}
       pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
     steps:
 
-      # Free GitHub Actions Environment Disk Space
-      - name: Maximize Build Space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /opt/ghc
-
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
       # Validate wrapper
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v3.3.2
-
-      # Setup Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
+        uses: gradle/actions/wrapper-validation@v3
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       # Set environment variables
       - name: Export Properties
@@ -74,7 +64,7 @@ jobs:
           echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-          ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
+          ./gradlew printProductsReleases # prepare list of IDEs for Plugin Verifier
 
       # Build plugin
       - name: Build plugin
@@ -102,23 +92,16 @@ jobs:
   test:
     name: Test
     needs: [ build ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
 
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
-      # Setup Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       # Run tests
       - name: Run Tests
@@ -132,61 +115,68 @@ jobs:
           name: tests-result
           path: ${{ github.workspace }}/build/reports/tests
 
-      # Upload Kover report to CodeCov
+      # Upload the Kover report to CodeCov
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v4
         with:
-          files: ${{ github.workspace }}/build/reports/kover/xml/report.xml
+          files: ${{ github.workspace }}/build/reports/kover/report.xml
 
   # Run Qodana inspections and provide report
   inspectCode:
     name: Inspect code
     needs: [ build ]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       checks: write
       pull-requests: write
     steps:
 
-      # Check out current repository
+      # Free GitHub Actions Environment Disk Space
+      - name: Maximize Build Space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          large-packages: false
+
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
-
-      # Setup Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
         with:
-          distribution: zulu
-          java-version: 17
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2024.1.4
+        uses: JetBrains/qodana-action@v2024.3
         with:
           cache-default-branch-only: true
+          pr-mode: false
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+          QODANA_ENDPOINT: 'https://qodana.cloud'
 
   # Run plugin structure verification along with IntelliJ Plugin Verifier
   verify:
     name: Verify plugin
-    needs: [ build, test, inspectCode ]
-    runs-on: ubuntu-latest
+    needs: [ build ]
+    runs-on: ubuntu-24.04
     steps:
 
-      # Check out current repository
+      # Free GitHub Actions Environment Disk Space
+      - name: Maximize Build Space
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          large-packages: false
+
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
-      # Setup Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache
@@ -197,7 +187,7 @@ jobs:
 
       # Run Verify Plugin task and IntelliJ Plugin Verifier tool
       - name: Run Plugin Verification tasks
-        run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
+        run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
 
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result
@@ -212,23 +202,16 @@ jobs:
   releaseDraft:
     name: Release draft
     if: github.event_name != 'pull_request'
-    needs: [ build, verify ]
-    runs-on: ubuntu-latest
+    needs: [ build, test, inspectCode, verify ]
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
     steps:
 
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
-      # Setup Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-
       # Remove old release drafts by using the curl request for the available releases with a draft flag
       - name: Remove Old Release Drafts
         env:
@@ -243,7 +226,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release create v${{ needs.build.outputs.version }} \
+          gh release create "v${{ needs.build.outputs.version }}" \
             --draft \
             --title "v${{ needs.build.outputs.version }}" \
             --notes "$(cat << 'EOM'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ec4a72..ec2c546 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,31 +9,24 @@ on:
 
 jobs:
 
-  # Prepare and publish the plugin to the Marketplace repository
+  # Prepare and publish the plugin to JetBrains Marketplace repository
   release:
     name: Publish Plugin
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       pull-requests: write
     steps:
 
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.release.tag_name }}
 
-      # Setup Java environment for the next steps
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       # Set environment variables
       - name: Export Properties
@@ -49,7 +42,7 @@ jobs:
           echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      # Update Unreleased section with the current release note
+      # Update the Unreleased section with the current release note
       - name: Patch Changelog
         if: ${{ steps.properties.outputs.changelog != '' }}
         env:
@@ -57,7 +50,7 @@ jobs:
         run: |
           ./gradlew patchChangelog --release-note="$CHANGELOG"
 
-      # Publish the plugin to the Marketplace
+      # Publish the plugin to JetBrains Marketplace
       - name: Publish Plugin
         env:
           PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
@@ -72,7 +65,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: gh release upload ${{ github.event.release.tag_name }} ./build/distributions/*
 
-      # Create pull request
+      # Create a pull request
       - name: Create Pull Request
         if: ${{ steps.properties.outputs.changelog != '' }}
         env:
@@ -91,6 +84,7 @@ jobs:
           
           gh label create "$LABEL" \
             --description "Pull requests with release changelog update" \
+            --force \
             || true
 
           gh pr create \
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
index c5fa155..c901413 100644
--- a/.github/workflows/run-ui-tests.yml
+++ b/.github/workflows/run-ui-tests.yml
@@ -1,9 +1,9 @@
 # GitHub Actions Workflow for launching UI tests on Linux, Windows, and Mac in the following steps:
-# - prepare and launch IDE with your plugin and robot-server plugin, which is needed to interact with UI
-# - wait for IDE to start
-# - run UI tests with separate Gradle task
+# - Prepare and launch IDE with your plugin and robot-server plugin, which is needed to interact with the UI.
+# - Wait for IDE to start.
+# - Run UI tests with a separate Gradle task.
 #
-# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Platform
+# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Platform.
 #
 # Workflow is triggered manually.
 
@@ -31,11 +31,11 @@ jobs:
 
     steps:
 
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
-      # Setup Java environment for the next steps
+      # Set up Java environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
@@ -44,7 +44,7 @@ jobs:
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       # Run IDEA prepared for UI testing
       - name: Run IDE
diff --git a/.gitignore b/.gitignore
index 20a7152..d1ed76b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .gradle
 .idea
+.intellijPlatform
 .qodana
 build
 jflex-1.9.1.jar
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ce1c62c..6b72a1e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,11 +5,13 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.run/Run Qodana.run.xml b/.run/Run Qodana.run.xml
index c92f33c..6b31b81 100644
--- a/.run/Run Qodana.run.xml	
+++ b/.run/Run Qodana.run.xml	
@@ -1,11 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Qodana" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="QODANA_SHOW_REPORT" value="true" />
-        </map>
-      </option>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
@@ -15,8 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="cleanInspections" />
-          <option value="runInspections" />
+          <option value="qodanaScan" />
         </list>
       </option>
       <option name="vmOptions" />
diff --git a/.run/Run Verifications.run.xml b/.run/Run Verifications.run.xml
index 3a8d688..3fd5c43 100644
--- a/.run/Run Verifications.run.xml	
+++ b/.run/Run Verifications.run.xml	
@@ -11,7 +11,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="runPluginVerifier" />
+          <option value="verifyPlugin" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73e1444..f90e3d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Upgraded gradle-intellij-plugin to v2
+
+## [0.1.6] - 2024-04-09
+
 ### Fixed
 
 - Support IntelliJ 2024.1, EAP
@@ -59,8 +65,8 @@
 
 - Initial scaffold created from [IntelliJ Platform Plugin Template](https://github.com/JetBrains/intellij-platform-plugin-template)
 
-[Unreleased]: https://github.com/olivernybroe/Wing-Idea/compare/v0.1.5...HEAD
-[0.1.5]: https://github.com/olivernybroe/Wing-Idea/compare/v0.1.0...v0.1.5
-[0.1.0]: https://github.com/olivernybroe/Wing-Idea/compare/v0.0.2...v0.1.0
-[0.0.2]: https://github.com/olivernybroe/Wing-Idea/compare/v0.0.1...v0.0.2
-[0.0.1]: https://github.com/olivernybroe/Wing-Idea/commits/v0.0.1
+[Unreleased]: https://github.com/Szasza/Wing-Idea/compare/v0.1.5...HEAD
+[0.1.5]: https://github.com/Szasza/Wing-Idea/compare/v0.1.0...v0.1.5
+[0.1.0]: https://github.com/Szasza/Wing-Idea/compare/v0.0.2...v0.1.0
+[0.0.2]: https://github.com/Szasza/Wing-Idea/compare/v0.0.1...v0.0.2
+[0.0.1]: https://github.com/Szasza/Wing-Idea/commits/v0.0.1
diff --git a/README.md b/README.md
index 016aeb8..5830231 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Wing-Idea
 
-![Build](https://github.com/olivernybroe/Wing-Idea/workflows/Build/badge.svg)
+![Build](https://github.com/Szasza/Wing-Idea/workflows/Build/badge.svg)
 [![Version](https://img.shields.io/jetbrains/plugin/v/22353.svg)](https://plugins.jetbrains.com/plugin/22353)
 [![Downloads](https://img.shields.io/jetbrains/plugin/d/22353.svg)](https://plugins.jetbrains.com/plugin/22353)
 
@@ -32,7 +32,7 @@ The following features are supported:
   
 - Manually:
 
-  Download the [latest release](https://github.com/olivernybroe/Wing-Idea/releases/latest) and install it manually using
+  Download the [latest release](https://github.com/Szasza/Wing-Idea/releases/latest) and install it manually using
   <kbd>Settings/Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd>
 
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 4573726..b8ace8d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,47 +1,73 @@
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 fun properties(key: String) = providers.gradleProperty(key)
 fun environment(key: String) = providers.environmentVariable(key)
 val ktorVersion: String by project
+val wingPluginVersion = properties("pluginVersion").get()
+val wingPluginSinceBuild = properties("pluginSinceBuild").get()
 
 plugins {
     id("java") // Java support
     alias(libs.plugins.kotlin) // Kotlin support
     alias(libs.plugins.kotlinSerialization)
-    alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
+    alias(libs.plugins.gradleIntelliJPlugin) // IntelliJ Platform Gradle Plugin
     alias(libs.plugins.changelog) // Gradle Changelog Plugin
     alias(libs.plugins.qodana) // Gradle Qodana Plugin
     alias(libs.plugins.kover) // Gradle Kover Plugin
 }
 
 group = properties("pluginGroup").get()
-version = properties("pluginVersion").get()
+version = "$wingPluginVersion.$wingPluginSinceBuild"
+
+// Set the JVM language level used to build the project.
+kotlin {
+    jvmToolchain(17)
+}
 
 // Configure project's dependencies
 repositories {
     mavenCentral()
+
+    // IntelliJ Platform Gradle Plugin Repositories Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-repositories-extension.html
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 configurations.all {
     exclude("org.slf4j", "slf4j-api")
+    exclude("org.jetbrains.kotlinx:kotlinx-coroutines")
 }
 
 // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
 dependencies {
-//    implementation(libs.annotations)
+    testImplementation(libs.junit)
+
+    // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
+    intellijPlatform {
+        create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"), useInstaller = false)
+
+        // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
+        bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
+
+        // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
+        plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
+
+        pluginVerifier()
+        zipSigner()
+        testFramework(TestFrameworkType.Platform)
+    }
+
+    implementation(libs.annotations)
     implementation("io.ktor:ktor-client-cio:$ktorVersion")
     implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
     implementation("io.ktor:ktor-client-websockets:$ktorVersion")
 }
 
-
-// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
-kotlin {
-    jvmToolchain(17)
-}
-
 java {
     // add gen path
     sourceSets {
@@ -57,55 +83,19 @@ idea {
     }
 }
 
-// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
-intellij {
-    pluginName = properties("pluginName")
-    version = properties("platformVersion")
-    type = properties("platformType")
-
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
-}
-
-// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-changelog {
-    groups.empty()
-    repositoryUrl = properties("pluginRepositoryUrl")
-}
-
-// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
-qodana {
-    cachePath = provider { file(".qodana").canonicalPath }
-    reportPath = provider { file("build/reports/inspections").canonicalPath }
-    saveReport = true
-    showReport = environment("QODANA_SHOW_REPORT").map { it.toBoolean() }.getOrElse(false)
-}
-
-// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
-koverReport {
-    defaults {
-        xml {
-            onCheck = true
-        }
-    }
-}
-
-tasks {
-    wrapper {
-        gradleVersion = properties("gradleVersion").get()
-    }
+// Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html
+intellijPlatform {
+    pluginConfiguration {
+        name = properties("pluginName")
 
-    patchPluginXml {
         version = properties("pluginVersion")
-        sinceBuild = properties("pluginSinceBuild")
-        untilBuild = properties("pluginUntilBuild")
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
-        pluginDescription = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
+        description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
             val start = "<!-- Plugin description -->"
             val end = "<!-- Plugin description end -->"
 
-            with (it.lines()) {
+            with(it.lines()) {
                 if (!containsAll(listOf(start, end))) {
                     throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
                 }
@@ -125,29 +115,82 @@ tasks {
                 )
             }
         }
-    }
 
-    // Configure UI tests plugin
-    // Read more: https://github.com/JetBrains/intellij-ui-test-robot
-    runIdeForUiTests {
-        systemProperty("robot-server.port", "8082")
-        systemProperty("ide.mac.message.dialogs.as.sheets", "false")
-        systemProperty("jb.privacy.policy.text", "<!--999.999-->")
-        systemProperty("jb.consents.confirmation.enabled", "false")
+        ideaVersion {
+            sinceBuild = properties("pluginSinceBuild")
+            untilBuild = properties("pluginUntilBuild")
+        }
     }
 
-    signPlugin {
-        certificateChain = environment("CERTIFICATE_CHAIN")
-        privateKey = environment("PRIVATE_KEY")
-        password = environment("PRIVATE_KEY_PASSWORD")
+    signing {
+        certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN")
+        privateKey = providers.environmentVariable("PRIVATE_KEY")
+        password = providers.environmentVariable("PRIVATE_KEY_PASSWORD")
     }
 
-    publishPlugin {
-        dependsOn("patchChangelog")
-        token = environment("PUBLISH_TOKEN")
+    publishing {
+        token = providers.environmentVariable("PUBLISH_TOKEN")
         // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels = properties("pluginVersion").map { listOf(it.split('-').getOrElse(1) { "default" }.split('.').first()) }
+        channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
+    }
+
+    pluginVerification {
+        ides {
+            ide(IntelliJPlatformType.IntellijIdeaUltimate, "2024.1")
+            recommended()
+            select {
+                types = listOf(IntelliJPlatformType.IntellijIdeaUltimate)
+                sinceBuild = "241"
+                untilBuild = "241.*"
+            }
+        }
+    }
+}
+
+// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
+changelog {
+    groups.empty()
+    repositoryUrl = properties("pluginRepositoryUrl")
+}
+
+// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
+koverReport {
+    defaults {
+        xml {
+            onCheck = true
+        }
+    }
+}
+
+tasks {
+    wrapper {
+        gradleVersion = properties("gradleVersion").get()
+    }
+
+    publishPlugin {
+        dependsOn("patchChangelog")
+    }
+}
+
+intellijPlatformTesting {
+    runIde {
+        register("runIdeForUiTests") {
+            task {
+                jvmArgumentProviders += CommandLineArgumentProvider {
+                    listOf(
+                        "-Drobot-server.port=8082",
+                        "-Dide.mac.message.dialogs.as.sheets=false",
+                        "-Djb.privacy.policy.text=<!--999.999-->",
+                        "-Djb.consents.confirmation.enabled=false",
+                    )
+                }
+            }
+
+            plugins {
+                robotServerPlugin()
+            }
+        }
     }
 }
diff --git a/gen/com/github/olivernybroe/wingidea/lang/parser/WingParser.java b/gen/com/github/wingidea/lang/parser/WingParser.java
similarity index 99%
rename from gen/com/github/olivernybroe/wingidea/lang/parser/WingParser.java
rename to gen/com/github/wingidea/lang/parser/WingParser.java
index 31703fd..1e2b7eb 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/parser/WingParser.java
+++ b/gen/com/github/wingidea/lang/parser/WingParser.java
@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.parser;
+package com.github.wingidea.lang.parser;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiBuilder.Marker;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import static com.github.olivernybroe.wingidea.lang.parser.WingParserUtil.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import static com.github.wingidea.lang.parser.WingParserUtil.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.tree.TokenSet;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/parser/_WingLexer.java b/gen/com/github/wingidea/lang/parser/_WingLexer.java
similarity index 99%
rename from gen/com/github/olivernybroe/wingidea/lang/parser/_WingLexer.java
rename to gen/com/github/wingidea/lang/parser/_WingLexer.java
index d671bb5..fe52619 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/parser/_WingLexer.java
+++ b/gen/com/github/wingidea/lang/parser/_WingLexer.java
@@ -1,14 +1,14 @@
 // Generated by JFlex 1.9.1 http://jflex.de/  (tweaked for IntelliJ platform)
 // source: Wing.flex
 
-package com.github.olivernybroe.wingidea.lang.parser;
+package com.github.wingidea.lang.parser;
 
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
 
 import static com.intellij.psi.TokenType.BAD_CHARACTER;
 import static com.intellij.psi.TokenType.WHITE_SPACE;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
 
 
 public class _WingLexer implements FlexLexer {
diff --git a/gen/com/github/wingidea/lang/parser/_WingLexer.java~ b/gen/com/github/wingidea/lang/parser/_WingLexer.java~
new file mode 100644
index 0000000..fe52619
--- /dev/null
+++ b/gen/com/github/wingidea/lang/parser/_WingLexer.java~
@@ -0,0 +1,1023 @@
+// Generated by JFlex 1.9.1 http://jflex.de/  (tweaked for IntelliJ platform)
+// source: Wing.flex
+
+package com.github.wingidea.lang.parser;
+
+import com.intellij.lexer.FlexLexer;
+import com.intellij.psi.tree.IElementType;
+
+import static com.intellij.psi.TokenType.BAD_CHARACTER;
+import static com.intellij.psi.TokenType.WHITE_SPACE;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+
+
+public class _WingLexer implements FlexLexer {
+
+  /** This character denotes the end of file */
+  public static final int YYEOF = -1;
+
+  /** initial size of the lookahead buffer */
+  private static final int ZZ_BUFFERSIZE = 16384;
+
+  /** lexical states */
+  public static final int YYINITIAL = 0;
+
+  /**
+   * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+   * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+   *                  at the beginning of a line
+   * l is of the form l = 2*k, k a non negative integer
+   */
+  private static final int ZZ_LEXSTATE[] = {
+     0, 0
+  };
+
+  /**
+   * Top-level table for translating characters to character classes
+   */
+  private static final int [] ZZ_CMAP_TOP = zzUnpackcmap_top();
+
+  private static final String ZZ_CMAP_TOP_PACKED_0 =
+    "\1\0\37\u0100\1\u0200\267\u0100\10\u0300\u1020\u0100";
+
+  private static int [] zzUnpackcmap_top() {
+    int [] result = new int[4352];
+    int offset = 0;
+    offset = zzUnpackcmap_top(ZZ_CMAP_TOP_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackcmap_top(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /**
+   * Second-level tables for translating characters to character classes
+   */
+  private static final int [] ZZ_CMAP_BLOCKS = zzUnpackcmap_blocks();
+
+  private static final String ZZ_CMAP_BLOCKS_PACKED_0 =
+    "\11\0\1\1\1\2\2\3\1\2\22\0\1\1\1\4"+
+    "\1\5\1\0\1\6\1\7\1\10\1\0\1\11\1\12"+
+    "\1\13\1\14\1\15\1\16\1\17\1\20\1\21\11\22"+
+    "\1\23\1\24\1\25\1\26\1\27\1\30\1\0\32\6"+
+    "\1\31\1\32\1\33\1\0\1\6\1\0\1\34\1\35"+
+    "\1\36\1\37\1\40\1\41\1\42\1\43\1\44\1\6"+
+    "\1\45\1\46\1\47\1\50\1\51\1\52\1\6\1\53"+
+    "\1\54\1\55\1\56\1\57\1\60\1\61\1\62\1\6"+
+    "\1\63\1\64\1\65\7\0\1\66\u01a2\0\2\66\326\0"+
+    "\u0100\66";
+
+  private static int [] zzUnpackcmap_blocks() {
+    int [] result = new int[1024];
+    int offset = 0;
+    offset = zzUnpackcmap_blocks(ZZ_CMAP_BLOCKS_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackcmap_blocks(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+  /**
+   * Translates DFA states to action switch labels.
+   */
+  private static final int [] ZZ_ACTION = zzUnpackAction();
+
+  private static final String ZZ_ACTION_PACKED_0 =
+    "\1\0\1\1\1\2\1\3\1\4\1\5\1\6\1\1"+
+    "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16"+
+    "\2\17\1\20\1\21\1\22\1\23\1\24\1\25\1\26"+
+    "\1\27\1\30\16\5\1\31\1\1\1\32\1\33\1\4"+
+    "\1\0\1\34\1\35\1\0\1\36\1\0\1\37\1\40"+
+    "\1\41\1\42\1\43\1\44\14\5\1\45\1\5\1\46"+
+    "\12\5\1\47\1\0\1\50\16\5\1\51\3\5\1\52"+
+    "\1\53\1\54\6\5\1\55\1\56\1\5\1\57\10\5"+
+    "\1\60\1\61\1\62\2\5\1\63\6\5\1\64\1\65"+
+    "\1\5\1\66\1\67\1\70\1\71\1\72\1\73\1\5"+
+    "\1\74\7\5\1\75\1\76\5\5\1\77\1\100\1\101"+
+    "\1\5\1\102\1\103\2\5\1\104\1\105\1\5\1\106";
+
+  private static int [] zzUnpackAction() {
+    int [] result = new int[174];
+    int offset = 0;
+    offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAction(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /**
+   * Translates a state to a row index in the transition table
+   */
+  private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
+
+  private static final String ZZ_ROWMAP_PACKED_0 =
+    "\0\0\0\67\0\156\0\245\0\334\0\u0113\0\67\0\u014a"+
+    "\0\67\0\67\0\u0181\0\67\0\67\0\67\0\67\0\u01b8"+
+    "\0\u01ef\0\u0226\0\67\0\67\0\u025d\0\u0294\0\u02cb\0\u0302"+
+    "\0\67\0\67\0\67\0\u0339\0\u0370\0\u03a7\0\u03de\0\u0415"+
+    "\0\u044c\0\u0483\0\u04ba\0\u04f1\0\u0528\0\u055f\0\u0596\0\u05cd"+
+    "\0\u0604\0\67\0\u063b\0\67\0\67\0\67\0\u0672\0\67"+
+    "\0\67\0\u06a9\0\u06e0\0\u0717\0\67\0\67\0\67\0\67"+
+    "\0\67\0\u074e\0\u0785\0\u07bc\0\u07f3\0\u082a\0\u0861\0\u0898"+
+    "\0\u08cf\0\u0906\0\u093d\0\u0974\0\u09ab\0\u09e2\0\u0113\0\u0a19"+
+    "\0\u0a50\0\u0a87\0\u0abe\0\u0af5\0\u0b2c\0\u0b63\0\u0b9a\0\u0bd1"+
+    "\0\u0c08\0\u0c3f\0\u0c76\0\67\0\u0cad\0\u0717\0\u0ce4\0\u0d1b"+
+    "\0\u0d52\0\u0d89\0\u0dc0\0\u0df7\0\u0e2e\0\u0e65\0\u0e9c\0\u0ed3"+
+    "\0\u0f0a\0\u0f41\0\u0f78\0\u0faf\0\u0113\0\u0fe6\0\u101d\0\u1054"+
+    "\0\u0113\0\u0113\0\u0113\0\u108b\0\u10c2\0\u10f9\0\u1130\0\u1167"+
+    "\0\u119e\0\u0113\0\u0113\0\u11d5\0\67\0\u120c\0\u1243\0\u127a"+
+    "\0\u12b1\0\u12e8\0\u131f\0\u1356\0\u138d\0\u0113\0\u0113\0\u0113"+
+    "\0\u13c4\0\u13fb\0\u0113\0\u1432\0\u1469\0\u14a0\0\u14d7\0\u150e"+
+    "\0\u1545\0\u0113\0\u0113\0\u157c\0\u0113\0\u0113\0\u0113\0\u0113"+
+    "\0\u0113\0\u0113\0\u15b3\0\u0113\0\u15ea\0\u1621\0\u1658\0\u168f"+
+    "\0\u16c6\0\u16fd\0\u1734\0\u0113\0\u0113\0\u176b\0\u17a2\0\u17d9"+
+    "\0\u1810\0\u1847\0\u0113\0\u0113\0\u0113\0\u187e\0\u0113\0\u0113"+
+    "\0\u18b5\0\u18ec\0\u0113\0\u0113\0\u1923\0\u0113";
+
+  private static int [] zzUnpackRowMap() {
+    int [] result = new int[174];
+    int offset = 0;
+    offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackRowMap(String packed, int offset, int [] result) {
+    int i = 0;  /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length() - 1;
+    while (i < l) {
+      int high = packed.charAt(i++) << 16;
+      result[j++] = high | packed.charAt(i++);
+    }
+    return j;
+  }
+
+  /**
+   * The transition table of the DFA
+   */
+  private static final int [] ZZ_TRANS = zzUnpacktrans();
+
+  private static final String ZZ_TRANS_PACKED_0 =
+    "\1\2\3\3\1\4\1\5\1\6\1\7\1\10\1\11"+
+    "\1\12\1\13\1\14\1\15\1\16\1\17\1\20\1\21"+
+    "\1\22\1\23\1\24\1\25\1\26\1\27\1\30\1\31"+
+    "\1\32\1\33\1\34\1\35\1\36\1\37\1\40\1\41"+
+    "\2\6\1\42\1\6\1\43\1\6\1\44\2\6\1\45"+
+    "\1\46\1\47\1\6\1\50\1\51\2\6\1\52\1\53"+
+    "\1\54\1\2\70\0\3\3\111\0\1\55\40\0\2\5"+
+    "\1\0\2\5\1\56\24\5\1\57\34\5\6\0\1\6"+
+    "\12\0\2\6\11\0\27\6\14\0\1\60\71\0\1\61"+
+    "\66\0\1\62\4\0\1\63\65\0\1\64\66\0\1\64"+
+    "\1\0\2\22\72\0\1\65\66\0\1\66\1\67\65\0"+
+    "\1\70\70\0\1\71\44\0\1\6\12\0\2\6\11\0"+
+    "\20\6\1\72\3\6\1\73\2\6\12\0\1\6\12\0"+
+    "\2\6\11\0\17\6\1\74\7\6\12\0\1\6\12\0"+
+    "\2\6\11\0\1\75\11\6\1\76\2\6\1\77\11\6"+
+    "\12\0\1\6\12\0\2\6\11\0\4\6\1\100\22\6"+
+    "\12\0\1\6\12\0\2\6\11\0\12\6\1\101\1\6"+
+    "\1\102\10\6\1\103\1\6\12\0\1\6\12\0\2\6"+
+    "\11\0\1\104\7\6\1\105\4\6\1\106\11\6\12\0"+
+    "\1\6\12\0\2\6\11\0\5\6\1\107\5\6\1\110"+
+    "\1\111\12\6\12\0\1\6\12\0\2\6\11\0\4\6"+
+    "\1\112\22\6\12\0\1\6\12\0\2\6\11\0\4\6"+
+    "\1\113\3\6\1\114\16\6\12\0\1\6\12\0\2\6"+
+    "\11\0\4\6\1\115\22\6\12\0\1\6\12\0\2\6"+
+    "\11\0\21\6\1\116\1\117\4\6\12\0\1\6\12\0"+
+    "\2\6\11\0\4\6\1\120\12\6\1\121\7\6\12\0"+
+    "\1\6\12\0\2\6\11\0\1\122\26\6\12\0\1\6"+
+    "\12\0\2\6\11\0\7\6\1\123\17\6\70\0\1\124"+
+    "\2\0\2\5\1\0\64\5\13\62\1\125\53\62\2\63"+
+    "\2\0\62\63\22\0\2\126\52\0\1\6\12\0\2\6"+
+    "\11\0\26\6\1\127\12\0\1\6\12\0\2\6\11\0"+
+    "\1\130\26\6\12\0\1\6\12\0\2\6\11\0\4\6"+
+    "\1\131\3\6\1\132\16\6\12\0\1\6\12\0\2\6"+
+    "\11\0\21\6\1\133\5\6\12\0\1\6\12\0\2\6"+
+    "\11\0\1\134\26\6\12\0\1\6\12\0\2\6\11\0"+
+    "\14\6\1\135\12\6\12\0\1\6\12\0\2\6\11\0"+
+    "\5\6\1\136\21\6\12\0\1\6\12\0\2\6\11\0"+
+    "\10\6\1\137\7\6\1\140\6\6\12\0\1\6\12\0"+
+    "\2\6\11\0\22\6\1\141\4\6\12\0\1\6\12\0"+
+    "\2\6\11\0\21\6\1\142\5\6\12\0\1\6\12\0"+
+    "\2\6\11\0\12\6\1\143\14\6\12\0\1\6\12\0"+
+    "\2\6\11\0\14\6\1\144\12\6\12\0\1\6\12\0"+
+    "\2\6\11\0\17\6\1\145\7\6\12\0\1\6\12\0"+
+    "\2\6\11\0\16\6\1\146\10\6\12\0\1\6\12\0"+
+    "\2\6\11\0\5\6\1\147\13\6\1\150\5\6\12\0"+
+    "\1\6\12\0\2\6\11\0\21\6\1\151\5\6\12\0"+
+    "\1\6\12\0\2\6\11\0\24\6\1\152\2\6\12\0"+
+    "\1\6\12\0\2\6\11\0\12\6\1\153\14\6\12\0"+
+    "\1\6\12\0\2\6\11\0\21\6\1\154\5\6\12\0"+
+    "\1\6\12\0\2\6\11\0\1\155\16\6\1\156\7\6"+
+    "\12\0\1\6\12\0\2\6\11\0\16\6\1\157\10\6"+
+    "\12\0\1\6\12\0\2\6\11\0\20\6\1\160\6\6"+
+    "\12\0\1\6\12\0\2\6\11\0\22\6\1\161\3\6"+
+    "\1\162\12\0\1\6\12\0\2\6\11\0\17\6\1\163"+
+    "\7\6\12\0\1\6\12\0\2\6\11\0\10\6\1\164"+
+    "\16\6\4\0\13\62\1\125\4\62\1\165\46\62\6\0"+
+    "\1\6\12\0\2\6\11\0\14\6\1\166\12\6\12\0"+
+    "\1\6\12\0\2\6\11\0\10\6\1\167\16\6\12\0"+
+    "\1\6\12\0\2\6\11\0\1\170\26\6\12\0\1\6"+
+    "\12\0\2\6\11\0\14\6\1\171\12\6\12\0\1\6"+
+    "\12\0\2\6\11\0\2\6\1\172\24\6\12\0\1\6"+
+    "\12\0\2\6\11\0\20\6\1\173\6\6\12\0\1\6"+
+    "\12\0\2\6\11\0\21\6\1\174\5\6\12\0\1\6"+
+    "\12\0\2\6\11\0\4\6\1\175\22\6\12\0\1\6"+
+    "\12\0\2\6\11\0\5\6\1\176\21\6\12\0\1\6"+
+    "\12\0\2\6\11\0\4\6\1\177\22\6\12\0\1\6"+
+    "\12\0\2\6\11\0\13\6\1\200\13\6\12\0\1\6"+
+    "\12\0\2\6\11\0\4\6\1\201\22\6\12\0\1\6"+
+    "\12\0\2\6\11\0\20\6\1\161\6\6\12\0\1\6"+
+    "\12\0\2\6\11\0\1\202\26\6\12\0\1\6\12\0"+
+    "\2\6\11\0\12\6\1\203\14\6\12\0\1\6\12\0"+
+    "\2\6\11\0\12\6\1\204\14\6\12\0\1\6\12\0"+
+    "\2\6\11\0\4\6\1\205\22\6\12\0\1\6\12\0"+
+    "\2\6\11\0\22\6\1\206\4\6\12\0\1\6\12\0"+
+    "\2\6\11\0\21\6\1\207\5\6\12\0\1\6\12\0"+
+    "\2\6\11\0\22\6\1\210\4\6\12\0\1\6\12\0"+
+    "\2\6\11\0\4\6\1\211\22\6\12\0\1\6\12\0"+
+    "\2\6\11\0\21\6\1\212\5\6\12\0\1\6\12\0"+
+    "\2\6\11\0\4\6\1\213\22\6\12\0\1\6\12\0"+
+    "\2\6\11\0\12\6\1\214\14\6\12\0\1\6\12\0"+
+    "\2\6\11\0\2\6\1\215\24\6\12\0\1\6\12\0"+
+    "\2\6\11\0\21\6\1\216\5\6\12\0\1\6\12\0"+
+    "\2\6\11\0\11\6\1\217\15\6\12\0\1\6\12\0"+
+    "\2\6\11\0\6\6\1\220\20\6\12\0\1\6\12\0"+
+    "\2\6\11\0\7\6\1\221\17\6\12\0\1\6\12\0"+
+    "\2\6\11\0\20\6\1\222\6\6\12\0\1\6\12\0"+
+    "\2\6\11\0\10\6\1\223\16\6\12\0\1\6\12\0"+
+    "\2\6\11\0\17\6\1\224\7\6\12\0\1\6\12\0"+
+    "\2\6\11\0\14\6\1\225\12\6\12\0\1\6\12\0"+
+    "\2\6\11\0\12\6\1\226\14\6\12\0\1\6\12\0"+
+    "\2\6\11\0\10\6\1\227\16\6\12\0\1\6\12\0"+
+    "\2\6\11\0\17\6\1\230\7\6\12\0\1\6\12\0"+
+    "\2\6\11\0\17\6\1\231\7\6\12\0\1\6\12\0"+
+    "\2\6\11\0\10\6\1\232\16\6\12\0\1\6\12\0"+
+    "\2\6\11\0\2\6\1\233\24\6\12\0\1\6\12\0"+
+    "\2\6\11\0\17\6\1\234\7\6\12\0\1\6\12\0"+
+    "\2\6\11\0\4\6\1\235\22\6\12\0\1\6\12\0"+
+    "\2\6\11\0\14\6\1\236\12\6\12\0\1\6\12\0"+
+    "\2\6\11\0\3\6\1\237\23\6\12\0\1\6\12\0"+
+    "\2\6\11\0\12\6\1\240\14\6\12\0\1\6\12\0"+
+    "\2\6\11\0\6\6\1\241\20\6\12\0\1\6\12\0"+
+    "\2\6\11\0\5\6\1\242\21\6\12\0\1\6\12\0"+
+    "\2\6\11\0\14\6\1\243\12\6\12\0\1\6\12\0"+
+    "\2\6\11\0\2\6\1\244\24\6\12\0\1\6\12\0"+
+    "\2\6\11\0\21\6\1\245\5\6\12\0\1\6\12\0"+
+    "\2\6\11\0\22\6\1\246\4\6\12\0\1\6\12\0"+
+    "\2\6\11\0\20\6\1\247\6\6\12\0\1\6\12\0"+
+    "\2\6\11\0\26\6\1\250\12\0\1\6\12\0\2\6"+
+    "\11\0\7\6\1\251\17\6\12\0\1\6\12\0\2\6"+
+    "\11\0\1\252\26\6\12\0\1\6\12\0\2\6\11\0"+
+    "\4\6\1\253\22\6\12\0\1\6\12\0\2\6\11\0"+
+    "\21\6\1\254\5\6\12\0\1\6\12\0\2\6\11\0"+
+    "\2\6\1\255\24\6\12\0\1\6\12\0\2\6\11\0"+
+    "\4\6\1\256\22\6\4\0";
+
+  private static int [] zzUnpacktrans() {
+    int [] result = new int[6490];
+    int offset = 0;
+    offset = zzUnpacktrans(ZZ_TRANS_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpacktrans(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      value--;
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+
+  /* error codes */
+  private static final int ZZ_UNKNOWN_ERROR = 0;
+  private static final int ZZ_NO_MATCH = 1;
+  private static final int ZZ_PUSHBACK_2BIG = 2;
+
+  /* error messages for the codes above */
+  private static final String[] ZZ_ERROR_MSG = {
+    "Unknown internal scanner error",
+    "Error: could not match input",
+    "Error: pushback value was too large"
+  };
+
+  /**
+   * ZZ_ATTRIBUTE[aState] contains the attributes of state {@code aState}
+   */
+  private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
+
+  private static final String ZZ_ATTRIBUTE_PACKED_0 =
+    "\1\0\1\11\4\1\1\11\1\1\2\11\1\1\4\11"+
+    "\3\1\2\11\4\1\3\11\16\1\1\11\1\1\3\11"+
+    "\1\0\2\11\1\0\1\1\1\0\5\11\32\1\1\11"+
+    "\1\0\37\1\1\11\71\1";
+
+  private static int [] zzUnpackAttribute() {
+    int [] result = new int[174];
+    int offset = 0;
+    offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
+    return result;
+  }
+
+  private static int zzUnpackAttribute(String packed, int offset, int [] result) {
+    int i = 0;       /* index in packed string  */
+    int j = offset;  /* index in unpacked array */
+    int l = packed.length();
+    while (i < l) {
+      int count = packed.charAt(i++);
+      int value = packed.charAt(i++);
+      do result[j++] = value; while (--count > 0);
+    }
+    return j;
+  }
+
+  /** the input device */
+  private java.io.Reader zzReader;
+
+  /** the current state of the DFA */
+  private int zzState;
+
+  /** the current lexical state */
+  private int zzLexicalState = YYINITIAL;
+
+  /** this buffer contains the current text to be matched and is
+      the source of the yytext() string */
+  private CharSequence zzBuffer = "";
+
+  /** the textposition at the last accepting state */
+  private int zzMarkedPos;
+
+  /** the current text position in the buffer */
+  private int zzCurrentPos;
+
+  /** startRead marks the beginning of the yytext() string in the buffer */
+  private int zzStartRead;
+
+  /** endRead marks the last character in the buffer, that has been read
+      from input */
+  private int zzEndRead;
+
+  /** zzAtEOF == true <=> the scanner is at the EOF */
+  private boolean zzAtEOF;
+
+  /** Number of newlines encountered up to the start of the matched text. */
+  @SuppressWarnings("unused")
+  private int yyline;
+
+  /** Number of characters from the last newline up to the start of the matched text. */
+  @SuppressWarnings("unused")
+  protected int yycolumn;
+
+  /** Number of characters up to the start of the matched text. */
+  @SuppressWarnings("unused")
+  private long yychar;
+
+  /** Whether the scanner is currently at the beginning of a line. */
+  @SuppressWarnings("unused")
+  private boolean zzAtBOL = true;
+
+  /** Whether the user-EOF-code has already been executed. */
+  @SuppressWarnings("unused")
+  private boolean zzEOFDone;
+
+  /* user code: */
+  public _WingLexer() {
+    this((java.io.Reader)null);
+  }
+
+
+  /**
+   * Creates a new scanner
+   *
+   * @param   in  the java.io.Reader to read input from.
+   */
+  public _WingLexer(java.io.Reader in) {
+    this.zzReader = in;
+  }
+
+
+  /** Returns the maximum size of the scanner buffer, which limits the size of tokens. */
+  private int zzMaxBufferLen() {
+    return Integer.MAX_VALUE;
+  }
+
+  /**  Whether the scanner buffer can grow to accommodate a larger token. */
+  private boolean zzCanGrow() {
+    return true;
+  }
+
+  /**
+   * Translates raw input code points to DFA table row
+   */
+  private static int zzCMap(int input) {
+    int offset = input & 255;
+    return offset == input ? ZZ_CMAP_BLOCKS[offset] : ZZ_CMAP_BLOCKS[ZZ_CMAP_TOP[input >> 8] | offset];
+  }
+
+  public final int getTokenStart() {
+    return zzStartRead;
+  }
+
+  public final int getTokenEnd() {
+    return getTokenStart() + yylength();
+  }
+
+  public void reset(CharSequence buffer, int start, int end, int initialState) {
+    zzBuffer = buffer;
+    zzCurrentPos = zzMarkedPos = zzStartRead = start;
+    zzAtEOF  = false;
+    zzAtBOL = true;
+    zzEndRead = end;
+    yybegin(initialState);
+  }
+
+  /**
+   * Refills the input buffer.
+   *
+   * @return      {@code false}, iff there was new input.
+   *
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  private boolean zzRefill() throws java.io.IOException {
+    return true;
+  }
+
+
+  /**
+   * Returns the current lexical state.
+   */
+  public final int yystate() {
+    return zzLexicalState;
+  }
+
+
+  /**
+   * Enters a new lexical state
+   *
+   * @param newState the new lexical state
+   */
+  public final void yybegin(int newState) {
+    zzLexicalState = newState;
+  }
+
+
+  /**
+   * Returns the text matched by the current regular expression.
+   */
+  public final CharSequence yytext() {
+    return zzBuffer.subSequence(zzStartRead, zzMarkedPos);
+  }
+
+
+  /**
+   * Returns the character at position {@code pos} from the
+   * matched text.
+   *
+   * It is equivalent to yytext().charAt(pos), but faster
+   *
+   * @param pos the position of the character to fetch.
+   *            A value from 0 to yylength()-1.
+   *
+   * @return the character at position pos
+   */
+  public final char yycharat(int pos) {
+    return zzBuffer.charAt(zzStartRead+pos);
+  }
+
+
+  /**
+   * Returns the length of the matched text region.
+   */
+  public final int yylength() {
+    return zzMarkedPos-zzStartRead;
+  }
+
+
+  /**
+   * Reports an error that occurred while scanning.
+   *
+   * In a wellformed scanner (no or only correct usage of
+   * yypushback(int) and a match-all fallback rule) this method
+   * will only be called with things that "Can't Possibly Happen".
+   * If this method is called, something is seriously wrong
+   * (e.g. a JFlex bug producing a faulty scanner etc.).
+   *
+   * Usual syntax/scanner level error handling should be done
+   * in error fallback rules.
+   *
+   * @param   errorCode  the code of the errormessage to display
+   */
+  private void zzScanError(int errorCode) {
+    String message;
+    try {
+      message = ZZ_ERROR_MSG[errorCode];
+    }
+    catch (ArrayIndexOutOfBoundsException e) {
+      message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR];
+    }
+
+    throw new Error(message);
+  }
+
+
+  /**
+   * Pushes the specified amount of characters back into the input stream.
+   *
+   * They will be read again by then next call of the scanning method
+   *
+   * @param number  the number of characters to be read again.
+   *                This number must not be greater than yylength()!
+   */
+  public void yypushback(int number)  {
+    if ( number > yylength() )
+      zzScanError(ZZ_PUSHBACK_2BIG);
+
+    zzMarkedPos -= number;
+  }
+
+
+  /**
+   * Resumes scanning until the next regular expression is matched,
+   * the end of input is encountered or an I/O-Error occurs.
+   *
+   * @return      the next token
+   * @exception   java.io.IOException  if any I/O-Error occurs
+   */
+  public IElementType advance() throws java.io.IOException
+  {
+    int zzInput;
+    int zzAction;
+
+    // cached fields:
+    int zzCurrentPosL;
+    int zzMarkedPosL;
+    int zzEndReadL = zzEndRead;
+    CharSequence zzBufferL = zzBuffer;
+
+    int [] zzTransL = ZZ_TRANS;
+    int [] zzRowMapL = ZZ_ROWMAP;
+    int [] zzAttrL = ZZ_ATTRIBUTE;
+
+    while (true) {
+      zzMarkedPosL = zzMarkedPos;
+
+      zzAction = -1;
+
+      zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
+
+      zzState = ZZ_LEXSTATE[zzLexicalState];
+
+      // set up zzAction for empty match case:
+      int zzAttributes = zzAttrL[zzState];
+      if ( (zzAttributes & 1) == 1 ) {
+        zzAction = zzState;
+      }
+
+
+      zzForAction: {
+        while (true) {
+
+          if (zzCurrentPosL < zzEndReadL) {
+            zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL);
+            zzCurrentPosL += Character.charCount(zzInput);
+          }
+          else if (zzAtEOF) {
+            zzInput = YYEOF;
+            break zzForAction;
+          }
+          else {
+            // store back cached positions
+            zzCurrentPos  = zzCurrentPosL;
+            zzMarkedPos   = zzMarkedPosL;
+            boolean eof = zzRefill();
+            // get translated positions and possibly new buffer
+            zzCurrentPosL  = zzCurrentPos;
+            zzMarkedPosL   = zzMarkedPos;
+            zzBufferL      = zzBuffer;
+            zzEndReadL     = zzEndRead;
+            if (eof) {
+              zzInput = YYEOF;
+              break zzForAction;
+            }
+            else {
+              zzInput = Character.codePointAt(zzBufferL, zzCurrentPosL);
+              zzCurrentPosL += Character.charCount(zzInput);
+            }
+          }
+          int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMap(zzInput) ];
+          if (zzNext == -1) break zzForAction;
+          zzState = zzNext;
+
+          zzAttributes = zzAttrL[zzState];
+          if ( (zzAttributes & 1) == 1 ) {
+            zzAction = zzState;
+            zzMarkedPosL = zzCurrentPosL;
+            if ( (zzAttributes & 8) == 8 ) break zzForAction;
+          }
+
+        }
+      }
+
+      // store back cached position
+      zzMarkedPos = zzMarkedPosL;
+
+      if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
+        zzAtEOF = true;
+        return null;
+      }
+      else {
+        switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
+          case 1:
+            { return BAD_CHARACTER;
+            }
+          // fall through
+          case 71: break;
+          case 2:
+            { return WHITE_SPACE;
+            }
+          // fall through
+          case 72: break;
+          case 3:
+            { return NOT;
+            }
+          // fall through
+          case 73: break;
+          case 4:
+            { return STRING_LITERAL;
+            }
+          // fall through
+          case 74: break;
+          case 5:
+            { return IDENTIFIER;
+            }
+          // fall through
+          case 75: break;
+          case 6:
+            { return MODULO;
+            }
+          // fall through
+          case 76: break;
+          case 7:
+            { return LEFT_PARENTHESIS;
+            }
+          // fall through
+          case 77: break;
+          case 8:
+            { return RIGHT_PARENTHESIS;
+            }
+          // fall through
+          case 78: break;
+          case 9:
+            { return MULTIPLY;
+            }
+          // fall through
+          case 79: break;
+          case 10:
+            { return ADDITION;
+            }
+          // fall through
+          case 80: break;
+          case 11:
+            { return COMMA;
+            }
+          // fall through
+          case 81: break;
+          case 12:
+            { return SUBTRACTION;
+            }
+          // fall through
+          case 82: break;
+          case 13:
+            { return DOT;
+            }
+          // fall through
+          case 83: break;
+          case 14:
+            { return DIVIDE;
+            }
+          // fall through
+          case 84: break;
+          case 15:
+            { return INTEGER;
+            }
+          // fall through
+          case 85: break;
+          case 16:
+            { return COLON;
+            }
+          // fall through
+          case 86: break;
+          case 17:
+            { return SEMICOLON;
+            }
+          // fall through
+          case 87: break;
+          case 18:
+            { return LESS_THAN;
+            }
+          // fall through
+          case 88: break;
+          case 19:
+            { return ASSIGNMENT;
+            }
+          // fall through
+          case 89: break;
+          case 20:
+            { return GREATER_THAN;
+            }
+          // fall through
+          case 90: break;
+          case 21:
+            { return QUESTION_MARK;
+            }
+          // fall through
+          case 91: break;
+          case 22:
+            { return LEFT_SQUARE_BRACE;
+            }
+          // fall through
+          case 92: break;
+          case 23:
+            { return FLOOR_DIVIDE;
+            }
+          // fall through
+          case 93: break;
+          case 24:
+            { return RIGHT_SQUARE_BRACE;
+            }
+          // fall through
+          case 94: break;
+          case 25:
+            { return LEFT_CURLY_BRACE;
+            }
+          // fall through
+          case 95: break;
+          case 26:
+            { return RIGHT_CURLY_BRACE;
+            }
+          // fall through
+          case 96: break;
+          case 27:
+            { return NOT_EQUAL;
+            }
+          // fall through
+          case 97: break;
+          case 28:
+            { return AND;
+            }
+          // fall through
+          case 98: break;
+          case 29:
+            { return POWER;
+            }
+          // fall through
+          case 99: break;
+          case 30:
+            { return COMMENT;
+            }
+          // fall through
+          case 100: break;
+          case 31:
+            { return LESS_THAN_OR_EQUAL;
+            }
+          // fall through
+          case 101: break;
+          case 32:
+            { return EQUAL;
+            }
+          // fall through
+          case 102: break;
+          case 33:
+            { return ARROW;
+            }
+          // fall through
+          case 103: break;
+          case 34:
+            { return GREATER_THAN_OR_EQUAL;
+            }
+          // fall through
+          case 104: break;
+          case 35:
+            { return UNWRAP_OR;
+            }
+          // fall through
+          case 105: break;
+          case 36:
+            { return ALIAS;
+            }
+          // fall through
+          case 106: break;
+          case 37:
+            { return IF;
+            }
+          // fall through
+          case 107: break;
+          case 38:
+            { return IN;
+            }
+          // fall through
+          case 108: break;
+          case 39:
+            { return OR;
+            }
+          // fall through
+          case 109: break;
+          case 40:
+            { return DECIMAL;
+            }
+          // fall through
+          case 110: break;
+          case 41:
+            { return FOR;
+            }
+          // fall through
+          case 111: break;
+          case 42:
+            { return LET;
+            }
+          // fall through
+          case 112: break;
+          case 43:
+            { return NEW;
+            }
+          // fall through
+          case 113: break;
+          case 44:
+            { return NIL;
+            }
+          // fall through
+          case 114: break;
+          case 45:
+            { return TRY;
+            }
+          // fall through
+          case 115: break;
+          case 46:
+            { return VAR;
+            }
+          // fall through
+          case 116: break;
+          case 47:
+            { return MULTI_LINE_COMMENT;
+            }
+          // fall through
+          case 117: break;
+          case 48:
+            { return ELIF;
+            }
+          // fall through
+          case 118: break;
+          case 49:
+            { return ELSE;
+            }
+          // fall through
+          case 119: break;
+          case 50:
+            { return ENUM;
+            }
+          // fall through
+          case 120: break;
+          case 51:
+            { return IMPLEMENTS;
+            }
+          // fall through
+          case 121: break;
+          case 52:
+            { return TEST;
+            }
+          // fall through
+          case 122: break;
+          case 53:
+            { return BOOL;
+            }
+          // fall through
+          case 123: break;
+          case 54:
+            { return ASYNC;
+            }
+          // fall through
+          case 124: break;
+          case 55:
+            { return AWAIT;
+            }
+          // fall through
+          case 125: break;
+          case 56:
+            { return BREAK;
+            }
+          // fall through
+          case 126: break;
+          case 57:
+            { return BRING;
+            }
+          // fall through
+          case 127: break;
+          case 58:
+            { return CATCH;
+            }
+          // fall through
+          case 128: break;
+          case 59:
+            { return CLASS;
+            }
+          // fall through
+          case 129: break;
+          case 60:
+            { return DEFER;
+            }
+          // fall through
+          case 130: break;
+          case 61:
+            { return SUPER;
+            }
+          // fall through
+          case 131: break;
+          case 62:
+            { return WHILE;
+            }
+          // fall through
+          case 132: break;
+          case 63:
+            { return RETURN;
+            }
+          // fall through
+          case 133: break;
+          case 64:
+            { return STATIC;
+            }
+          // fall through
+          case 134: break;
+          case 65:
+            { return STRUCT;
+            }
+          // fall through
+          case 135: break;
+          case 66:
+            { return EXTENDS;
+            }
+          // fall through
+          case 136: break;
+          case 67:
+            { return FINALLY;
+            }
+          // fall through
+          case 137: break;
+          case 68:
+            { return CONTINUE;
+            }
+          // fall through
+          case 138: break;
+          case 69:
+            { return INFLIGHT_SPECIFIER;
+            }
+          // fall through
+          case 139: break;
+          case 70:
+            { return INTERFACE;
+            }
+          // fall through
+          case 140: break;
+          default:
+            zzScanError(ZZ_NO_MATCH);
+          }
+      }
+    }
+  }
+
+
+}
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingAccessModifier.java b/gen/com/github/wingidea/lang/psi/WingAccessModifier.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingAccessModifier.java
rename to gen/com/github/wingidea/lang/psi/WingAccessModifier.java
index 3aaaca7..e66d0e8 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingAccessModifier.java
+++ b/gen/com/github/wingidea/lang/psi/WingAccessModifier.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingAccessor.java b/gen/com/github/wingidea/lang/psi/WingAccessor.java
similarity index 80%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingAccessor.java
rename to gen/com/github/wingidea/lang/psi/WingAccessor.java
index 3d8832a..1e47b2e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingAccessor.java
+++ b/gen/com/github/wingidea/lang/psi/WingAccessor.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingArgument.java b/gen/com/github/wingidea/lang/psi/WingArgument.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingArgument.java
rename to gen/com/github/wingidea/lang/psi/WingArgument.java
index b8820ee..250909f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingArgument.java
+++ b/gen/com/github/wingidea/lang/psi/WingArgument.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingArgumentList.java b/gen/com/github/wingidea/lang/psi/WingArgumentList.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingArgumentList.java
rename to gen/com/github/wingidea/lang/psi/WingArgumentList.java
index 37ba64e..fecc89f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingArgumentList.java
+++ b/gen/com/github/wingidea/lang/psi/WingArgumentList.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingArrayLiteralExpression.java b/gen/com/github/wingidea/lang/psi/WingArrayLiteralExpression.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingArrayLiteralExpression.java
rename to gen/com/github/wingidea/lang/psi/WingArrayLiteralExpression.java
index bc3a68f..db6cc9b 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingArrayLiteralExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingArrayLiteralExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingAwaitExpression.java b/gen/com/github/wingidea/lang/psi/WingAwaitExpression.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingAwaitExpression.java
rename to gen/com/github/wingidea/lang/psi/WingAwaitExpression.java
index e8eed28..3459442 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingAwaitExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingAwaitExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingBinaryExpression.java b/gen/com/github/wingidea/lang/psi/WingBinaryExpression.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingBinaryExpression.java
rename to gen/com/github/wingidea/lang/psi/WingBinaryExpression.java
index 6c83aec..ad46ab7 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingBinaryExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingBinaryExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingBlockStatement.java b/gen/com/github/wingidea/lang/psi/WingBlockStatement.java
similarity index 97%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingBlockStatement.java
rename to gen/com/github/wingidea/lang/psi/WingBlockStatement.java
index 4908706..4288f08 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingBlockStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingBlockStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingBreakStatement.java b/gen/com/github/wingidea/lang/psi/WingBreakStatement.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingBreakStatement.java
rename to gen/com/github/wingidea/lang/psi/WingBreakStatement.java
index efcdaae..c2740b9 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingBreakStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingBreakStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingCallExpression.java b/gen/com/github/wingidea/lang/psi/WingCallExpression.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingCallExpression.java
rename to gen/com/github/wingidea/lang/psi/WingCallExpression.java
index 2ae29cc..8adf0d2 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingCallExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingCallExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingCatchBlock.java b/gen/com/github/wingidea/lang/psi/WingCatchBlock.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingCatchBlock.java
rename to gen/com/github/wingidea/lang/psi/WingCatchBlock.java
index 06fbbc6..a1915af 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingCatchBlock.java
+++ b/gen/com/github/wingidea/lang/psi/WingCatchBlock.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingClassDefinitionStatement.java b/gen/com/github/wingidea/lang/psi/WingClassDefinitionStatement.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingClassDefinitionStatement.java
rename to gen/com/github/wingidea/lang/psi/WingClassDefinitionStatement.java
index 7b7619e..d383d59 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingClassDefinitionStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingClassDefinitionStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingClassField.java b/gen/com/github/wingidea/lang/psi/WingClassField.java
similarity index 89%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingClassField.java
rename to gen/com/github/wingidea/lang/psi/WingClassField.java
index 35d2a41..e1adaa0 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingClassField.java
+++ b/gen/com/github/wingidea/lang/psi/WingClassField.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingClassImplementation.java b/gen/com/github/wingidea/lang/psi/WingClassImplementation.java
similarity index 90%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingClassImplementation.java
rename to gen/com/github/wingidea/lang/psi/WingClassImplementation.java
index 8018fcc..2b8311c 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingClassImplementation.java
+++ b/gen/com/github/wingidea/lang/psi/WingClassImplementation.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingCollectionLiteralExpression.java b/gen/com/github/wingidea/lang/psi/WingCollectionLiteralExpression.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingCollectionLiteralExpression.java
rename to gen/com/github/wingidea/lang/psi/WingCollectionLiteralExpression.java
index 28def5e..cb2ed6d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingCollectionLiteralExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingCollectionLiteralExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingContainerValueType.java b/gen/com/github/wingidea/lang/psi/WingContainerValueType.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingContainerValueType.java
rename to gen/com/github/wingidea/lang/psi/WingContainerValueType.java
index 1384941..59808b8 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingContainerValueType.java
+++ b/gen/com/github/wingidea/lang/psi/WingContainerValueType.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingContinueStatement.java b/gen/com/github/wingidea/lang/psi/WingContinueStatement.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingContinueStatement.java
rename to gen/com/github/wingidea/lang/psi/WingContinueStatement.java
index e152d31..d7187e6 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingContinueStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingContinueStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingDeferExpression.java b/gen/com/github/wingidea/lang/psi/WingDeferExpression.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingDeferExpression.java
rename to gen/com/github/wingidea/lang/psi/WingDeferExpression.java
index e7232f0..92f792f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingDeferExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingDeferExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingDuration.java b/gen/com/github/wingidea/lang/psi/WingDuration.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingDuration.java
rename to gen/com/github/wingidea/lang/psi/WingDuration.java
index 0750493..6147df2 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingDuration.java
+++ b/gen/com/github/wingidea/lang/psi/WingDuration.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingElIfBlock.java b/gen/com/github/wingidea/lang/psi/WingElIfBlock.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingElIfBlock.java
rename to gen/com/github/wingidea/lang/psi/WingElIfBlock.java
index 06af32f..1fec299 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingElIfBlock.java
+++ b/gen/com/github/wingidea/lang/psi/WingElIfBlock.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingElementTypes.java b/gen/com/github/wingidea/lang/psi/WingElementTypes.java
similarity index 99%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingElementTypes.java
rename to gen/com/github/wingidea/lang/psi/WingElementTypes.java
index 682fd26..858434e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingElementTypes.java
+++ b/gen/com/github/wingidea/lang/psi/WingElementTypes.java
@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.PsiElement;
 import com.intellij.lang.ASTNode;
-import com.github.olivernybroe.wingidea.lang.psi.impl.*;
+import com.github.wingidea.lang.psi.impl.*;
 
 public interface WingElementTypes {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingEnumDefinitionStatement.java b/gen/com/github/wingidea/lang/psi/WingEnumDefinitionStatement.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingEnumDefinitionStatement.java
rename to gen/com/github/wingidea/lang/psi/WingEnumDefinitionStatement.java
index 4a19308..1bd45fe 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingEnumDefinitionStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingEnumDefinitionStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingEnumField.java b/gen/com/github/wingidea/lang/psi/WingEnumField.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingEnumField.java
rename to gen/com/github/wingidea/lang/psi/WingEnumField.java
index 3edf538..2f10cab 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingEnumField.java
+++ b/gen/com/github/wingidea/lang/psi/WingEnumField.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingExpression.java b/gen/com/github/wingidea/lang/psi/WingExpression.java
similarity index 80%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingExpression.java
rename to gen/com/github/wingidea/lang/psi/WingExpression.java
index 18e8414..4e9b242 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingExpressionStatement.java b/gen/com/github/wingidea/lang/psi/WingExpressionStatement.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingExpressionStatement.java
rename to gen/com/github/wingidea/lang/psi/WingExpressionStatement.java
index fd355d2..6d88ae6 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingExpressionStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingExpressionStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingExternModifier.java b/gen/com/github/wingidea/lang/psi/WingExternModifier.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingExternModifier.java
rename to gen/com/github/wingidea/lang/psi/WingExternModifier.java
index c59906f..dc2ef60 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingExternModifier.java
+++ b/gen/com/github/wingidea/lang/psi/WingExternModifier.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingFinallyBlock.java b/gen/com/github/wingidea/lang/psi/WingFinallyBlock.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingFinallyBlock.java
rename to gen/com/github/wingidea/lang/psi/WingFinallyBlock.java
index 6480347..e6e8bdc 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingFinallyBlock.java
+++ b/gen/com/github/wingidea/lang/psi/WingFinallyBlock.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingForInLoopStatement.java b/gen/com/github/wingidea/lang/psi/WingForInLoopStatement.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingForInLoopStatement.java
rename to gen/com/github/wingidea/lang/psi/WingForInLoopStatement.java
index a8fb963..0a9013b 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingForInLoopStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingForInLoopStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingFunctionType.java b/gen/com/github/wingidea/lang/psi/WingFunctionType.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingFunctionType.java
rename to gen/com/github/wingidea/lang/psi/WingFunctionType.java
index 4ee5231..5de6e6a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingFunctionType.java
+++ b/gen/com/github/wingidea/lang/psi/WingFunctionType.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingIfLetStatement.java b/gen/com/github/wingidea/lang/psi/WingIfLetStatement.java
similarity index 89%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingIfLetStatement.java
rename to gen/com/github/wingidea/lang/psi/WingIfLetStatement.java
index e672465..60ce4b1 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingIfLetStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingIfLetStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingIfStatement.java b/gen/com/github/wingidea/lang/psi/WingIfStatement.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingIfStatement.java
rename to gen/com/github/wingidea/lang/psi/WingIfStatement.java
index ea75b5d..fd4ec83 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingIfStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingIfStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingImportStatement.java b/gen/com/github/wingidea/lang/psi/WingImportStatement.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingImportStatement.java
rename to gen/com/github/wingidea/lang/psi/WingImportStatement.java
index 6331b32..cda2205 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingImportStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingImportStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingImportStatementBlock.java b/gen/com/github/wingidea/lang/psi/WingImportStatementBlock.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingImportStatementBlock.java
rename to gen/com/github/wingidea/lang/psi/WingImportStatementBlock.java
index 07ff4d7..c911e23 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingImportStatementBlock.java
+++ b/gen/com/github/wingidea/lang/psi/WingImportStatementBlock.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightClosureExpression.java b/gen/com/github/wingidea/lang/psi/WingInflightClosureExpression.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightClosureExpression.java
rename to gen/com/github/wingidea/lang/psi/WingInflightClosureExpression.java
index 0eae071..17e6dc2 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightClosureExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingInflightClosureExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightMethodDefinition.java b/gen/com/github/wingidea/lang/psi/WingInflightMethodDefinition.java
similarity index 91%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightMethodDefinition.java
rename to gen/com/github/wingidea/lang/psi/WingInflightMethodDefinition.java
index 0765424..58cfb6e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightMethodDefinition.java
+++ b/gen/com/github/wingidea/lang/psi/WingInflightMethodDefinition.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightMethodSignature.java b/gen/com/github/wingidea/lang/psi/WingInflightMethodSignature.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightMethodSignature.java
rename to gen/com/github/wingidea/lang/psi/WingInflightMethodSignature.java
index e906839..7f72e11 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInflightMethodSignature.java
+++ b/gen/com/github/wingidea/lang/psi/WingInflightMethodSignature.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInitializer.java b/gen/com/github/wingidea/lang/psi/WingInitializer.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingInitializer.java
rename to gen/com/github/wingidea/lang/psi/WingInitializer.java
index 2a29a41..b0b7938 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInitializer.java
+++ b/gen/com/github/wingidea/lang/psi/WingInitializer.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInterfaceDefinitionStatement.java b/gen/com/github/wingidea/lang/psi/WingInterfaceDefinitionStatement.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingInterfaceDefinitionStatement.java
rename to gen/com/github/wingidea/lang/psi/WingInterfaceDefinitionStatement.java
index 464aea4..1d2826a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInterfaceDefinitionStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingInterfaceDefinitionStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInterfaceImplementation.java b/gen/com/github/wingidea/lang/psi/WingInterfaceImplementation.java
similarity index 89%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingInterfaceImplementation.java
rename to gen/com/github/wingidea/lang/psi/WingInterfaceImplementation.java
index f467a0e..310e608 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingInterfaceImplementation.java
+++ b/gen/com/github/wingidea/lang/psi/WingInterfaceImplementation.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonLiteralExpression.java b/gen/com/github/wingidea/lang/psi/WingJsonLiteralExpression.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonLiteralExpression.java
rename to gen/com/github/wingidea/lang/psi/WingJsonLiteralExpression.java
index 07b8538..f35ee23 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonLiteralExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingJsonLiteralExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonMapLiteral.java b/gen/com/github/wingidea/lang/psi/WingJsonMapLiteral.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonMapLiteral.java
rename to gen/com/github/wingidea/lang/psi/WingJsonMapLiteral.java
index 3faac91..2623f00 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonMapLiteral.java
+++ b/gen/com/github/wingidea/lang/psi/WingJsonMapLiteral.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonMapLiteralMember.java b/gen/com/github/wingidea/lang/psi/WingJsonMapLiteralMember.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonMapLiteralMember.java
rename to gen/com/github/wingidea/lang/psi/WingJsonMapLiteralMember.java
index 4612a40..ecd5cb2 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingJsonMapLiteralMember.java
+++ b/gen/com/github/wingidea/lang/psi/WingJsonMapLiteralMember.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingLiteralExpression.java b/gen/com/github/wingidea/lang/psi/WingLiteralExpression.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingLiteralExpression.java
rename to gen/com/github/wingidea/lang/psi/WingLiteralExpression.java
index 0b82b77..8b1b712 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingLiteralExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingLiteralExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingLogicalOperators.java b/gen/com/github/wingidea/lang/psi/WingLogicalOperators.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingLogicalOperators.java
rename to gen/com/github/wingidea/lang/psi/WingLogicalOperators.java
index 32a08a8..b0e2b87 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingLogicalOperators.java
+++ b/gen/com/github/wingidea/lang/psi/WingLogicalOperators.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingLoopRange.java b/gen/com/github/wingidea/lang/psi/WingLoopRange.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingLoopRange.java
rename to gen/com/github/wingidea/lang/psi/WingLoopRange.java
index 6446dfe..57443aa 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingLoopRange.java
+++ b/gen/com/github/wingidea/lang/psi/WingLoopRange.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMapLiteralExpression.java b/gen/com/github/wingidea/lang/psi/WingMapLiteralExpression.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingMapLiteralExpression.java
rename to gen/com/github/wingidea/lang/psi/WingMapLiteralExpression.java
index 452cd00..375ddb4 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMapLiteralExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingMapLiteralExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMapLiteralMember.java b/gen/com/github/wingidea/lang/psi/WingMapLiteralMember.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingMapLiteralMember.java
rename to gen/com/github/wingidea/lang/psi/WingMapLiteralMember.java
index 4c627ac..1bc851c 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMapLiteralMember.java
+++ b/gen/com/github/wingidea/lang/psi/WingMapLiteralMember.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMathematicalOperators.java b/gen/com/github/wingidea/lang/psi/WingMathematicalOperators.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingMathematicalOperators.java
rename to gen/com/github/wingidea/lang/psi/WingMathematicalOperators.java
index d224909..d614a66 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMathematicalOperators.java
+++ b/gen/com/github/wingidea/lang/psi/WingMathematicalOperators.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMethodDefinition.java b/gen/com/github/wingidea/lang/psi/WingMethodDefinition.java
similarity index 91%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingMethodDefinition.java
rename to gen/com/github/wingidea/lang/psi/WingMethodDefinition.java
index c635bc1..dc05f77 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMethodDefinition.java
+++ b/gen/com/github/wingidea/lang/psi/WingMethodDefinition.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMethodSignature.java b/gen/com/github/wingidea/lang/psi/WingMethodSignature.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingMethodSignature.java
rename to gen/com/github/wingidea/lang/psi/WingMethodSignature.java
index 4cda406..f9cfd49 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingMethodSignature.java
+++ b/gen/com/github/wingidea/lang/psi/WingMethodSignature.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNestedIdentifierExpression.java b/gen/com/github/wingidea/lang/psi/WingNestedIdentifierExpression.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingNestedIdentifierExpression.java
rename to gen/com/github/wingidea/lang/psi/WingNestedIdentifierExpression.java
index d66238c..ce1897e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNestedIdentifierExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingNestedIdentifierExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNestedIdentifierJsonExpression.java b/gen/com/github/wingidea/lang/psi/WingNestedIdentifierJsonExpression.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingNestedIdentifierJsonExpression.java
rename to gen/com/github/wingidea/lang/psi/WingNestedIdentifierJsonExpression.java
index 49851e7..2850d5d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNestedIdentifierJsonExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingNestedIdentifierJsonExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNewExpression.java b/gen/com/github/wingidea/lang/psi/WingNewExpression.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingNewExpression.java
rename to gen/com/github/wingidea/lang/psi/WingNewExpression.java
index faa90af..54470cb 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNewExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingNewExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNumber.java b/gen/com/github/wingidea/lang/psi/WingNumber.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingNumber.java
rename to gen/com/github/wingidea/lang/psi/WingNumber.java
index ea801f5..b685da5 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingNumber.java
+++ b/gen/com/github/wingidea/lang/psi/WingNumber.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingOperators.java b/gen/com/github/wingidea/lang/psi/WingOperators.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingOperators.java
rename to gen/com/github/wingidea/lang/psi/WingOperators.java
index b390573..6246932 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingOperators.java
+++ b/gen/com/github/wingidea/lang/psi/WingOperators.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingOptionalTestExpression.java b/gen/com/github/wingidea/lang/psi/WingOptionalTestExpression.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingOptionalTestExpression.java
rename to gen/com/github/wingidea/lang/psi/WingOptionalTestExpression.java
index befdb61..8e52eed 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingOptionalTestExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingOptionalTestExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterDefinition.java b/gen/com/github/wingidea/lang/psi/WingParameterDefinition.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterDefinition.java
rename to gen/com/github/wingidea/lang/psi/WingParameterDefinition.java
index eac7408..acc5d91 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterDefinition.java
+++ b/gen/com/github/wingidea/lang/psi/WingParameterDefinition.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterList.java b/gen/com/github/wingidea/lang/psi/WingParameterList.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterList.java
rename to gen/com/github/wingidea/lang/psi/WingParameterList.java
index 98c253d..05cde52 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterList.java
+++ b/gen/com/github/wingidea/lang/psi/WingParameterList.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterTypeList.java b/gen/com/github/wingidea/lang/psi/WingParameterTypeList.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterTypeList.java
rename to gen/com/github/wingidea/lang/psi/WingParameterTypeList.java
index 7d5f874..12d547c 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParameterTypeList.java
+++ b/gen/com/github/wingidea/lang/psi/WingParameterTypeList.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParenthesizedExpression.java b/gen/com/github/wingidea/lang/psi/WingParenthesizedExpression.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingParenthesizedExpression.java
rename to gen/com/github/wingidea/lang/psi/WingParenthesizedExpression.java
index f31661f..b9cb5b8 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingParenthesizedExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingParenthesizedExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingPreflightClosureExpression.java b/gen/com/github/wingidea/lang/psi/WingPreflightClosureExpression.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingPreflightClosureExpression.java
rename to gen/com/github/wingidea/lang/psi/WingPreflightClosureExpression.java
index 955445e..6714d9e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingPreflightClosureExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingPreflightClosureExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingReferenceExpression.java b/gen/com/github/wingidea/lang/psi/WingReferenceExpression.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingReferenceExpression.java
rename to gen/com/github/wingidea/lang/psi/WingReferenceExpression.java
index bc2d1d7..711b0ef 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingReferenceExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingReferenceExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingRelationalOperators.java b/gen/com/github/wingidea/lang/psi/WingRelationalOperators.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingRelationalOperators.java
rename to gen/com/github/wingidea/lang/psi/WingRelationalOperators.java
index 0dac492..b6f0062 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingRelationalOperators.java
+++ b/gen/com/github/wingidea/lang/psi/WingRelationalOperators.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingResourceDefinitionStatement.java b/gen/com/github/wingidea/lang/psi/WingResourceDefinitionStatement.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingResourceDefinitionStatement.java
rename to gen/com/github/wingidea/lang/psi/WingResourceDefinitionStatement.java
index 830ec28..678e544 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingResourceDefinitionStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingResourceDefinitionStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingResourceImplementation.java b/gen/com/github/wingidea/lang/psi/WingResourceImplementation.java
similarity index 90%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingResourceImplementation.java
rename to gen/com/github/wingidea/lang/psi/WingResourceImplementation.java
index e8044e5..64ef771 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingResourceImplementation.java
+++ b/gen/com/github/wingidea/lang/psi/WingResourceImplementation.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingReturnStatement.java b/gen/com/github/wingidea/lang/psi/WingReturnStatement.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingReturnStatement.java
rename to gen/com/github/wingidea/lang/psi/WingReturnStatement.java
index 80433d7..4521ee4 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingReturnStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingReturnStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingSetLiteralExpression.java b/gen/com/github/wingidea/lang/psi/WingSetLiteralExpression.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingSetLiteralExpression.java
rename to gen/com/github/wingidea/lang/psi/WingSetLiteralExpression.java
index 48a7223..bcee41c 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingSetLiteralExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingSetLiteralExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingString.java b/gen/com/github/wingidea/lang/psi/WingString.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingString.java
rename to gen/com/github/wingidea/lang/psi/WingString.java
index 5fab123..62f1690 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingString.java
+++ b/gen/com/github/wingidea/lang/psi/WingString.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructDefinitionStatement.java b/gen/com/github/wingidea/lang/psi/WingStructDefinitionStatement.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingStructDefinitionStatement.java
rename to gen/com/github/wingidea/lang/psi/WingStructDefinitionStatement.java
index 2e2238e..6c502a0 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructDefinitionStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingStructDefinitionStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructField.java b/gen/com/github/wingidea/lang/psi/WingStructField.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingStructField.java
rename to gen/com/github/wingidea/lang/psi/WingStructField.java
index 38ea95e..dafee62 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructField.java
+++ b/gen/com/github/wingidea/lang/psi/WingStructField.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructLiteralExpression.java b/gen/com/github/wingidea/lang/psi/WingStructLiteralExpression.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingStructLiteralExpression.java
rename to gen/com/github/wingidea/lang/psi/WingStructLiteralExpression.java
index f3dd9b8..0887d21 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructLiteralExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingStructLiteralExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructLiteralMember.java b/gen/com/github/wingidea/lang/psi/WingStructLiteralMember.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingStructLiteralMember.java
rename to gen/com/github/wingidea/lang/psi/WingStructLiteralMember.java
index 4282164..e80efc5 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructLiteralMember.java
+++ b/gen/com/github/wingidea/lang/psi/WingStructLiteralMember.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructuredAccessExpression.java b/gen/com/github/wingidea/lang/psi/WingStructuredAccessExpression.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingStructuredAccessExpression.java
rename to gen/com/github/wingidea/lang/psi/WingStructuredAccessExpression.java
index 94b4463..7cb987f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingStructuredAccessExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingStructuredAccessExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingSuperCallExpression.java b/gen/com/github/wingidea/lang/psi/WingSuperCallExpression.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingSuperCallExpression.java
rename to gen/com/github/wingidea/lang/psi/WingSuperCallExpression.java
index b0d1ea7..d4bb733 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingSuperCallExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingSuperCallExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingSuperConstructorStatement.java b/gen/com/github/wingidea/lang/psi/WingSuperConstructorStatement.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingSuperConstructorStatement.java
rename to gen/com/github/wingidea/lang/psi/WingSuperConstructorStatement.java
index 5cc0055..dc9251f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingSuperConstructorStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingSuperConstructorStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingTestStatement.java b/gen/com/github/wingidea/lang/psi/WingTestStatement.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingTestStatement.java
rename to gen/com/github/wingidea/lang/psi/WingTestStatement.java
index 7ae612a..c850d0a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingTestStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingTestStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingTryCatchStatement.java b/gen/com/github/wingidea/lang/psi/WingTryCatchStatement.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingTryCatchStatement.java
rename to gen/com/github/wingidea/lang/psi/WingTryCatchStatement.java
index 269f379..83a3bb8 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingTryCatchStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingTryCatchStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingType.java b/gen/com/github/wingidea/lang/psi/WingType.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingType.java
rename to gen/com/github/wingidea/lang/psi/WingType.java
index 1f27244..176b67d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingType.java
+++ b/gen/com/github/wingidea/lang/psi/WingType.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingTypeAnnotation.java b/gen/com/github/wingidea/lang/psi/WingTypeAnnotation.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingTypeAnnotation.java
rename to gen/com/github/wingidea/lang/psi/WingTypeAnnotation.java
index 412dcaa..2a4bd47 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingTypeAnnotation.java
+++ b/gen/com/github/wingidea/lang/psi/WingTypeAnnotation.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingUnaryExpression.java b/gen/com/github/wingidea/lang/psi/WingUnaryExpression.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingUnaryExpression.java
rename to gen/com/github/wingidea/lang/psi/WingUnaryExpression.java
index 6f597bc..d02e08f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingUnaryExpression.java
+++ b/gen/com/github/wingidea/lang/psi/WingUnaryExpression.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingUnaryOperators.java b/gen/com/github/wingidea/lang/psi/WingUnaryOperators.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingUnaryOperators.java
rename to gen/com/github/wingidea/lang/psi/WingUnaryOperators.java
index b55b43a..290b4bf 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingUnaryOperators.java
+++ b/gen/com/github/wingidea/lang/psi/WingUnaryOperators.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingVariableAssignmentStatement.java b/gen/com/github/wingidea/lang/psi/WingVariableAssignmentStatement.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingVariableAssignmentStatement.java
rename to gen/com/github/wingidea/lang/psi/WingVariableAssignmentStatement.java
index 99dbf9e..adf2a22 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingVariableAssignmentStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingVariableAssignmentStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingVariableDefinitionStatement.java b/gen/com/github/wingidea/lang/psi/WingVariableDefinitionStatement.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingVariableDefinitionStatement.java
rename to gen/com/github/wingidea/lang/psi/WingVariableDefinitionStatement.java
index dfabb8b..fd0a25f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingVariableDefinitionStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingVariableDefinitionStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingVisitor.java b/gen/com/github/wingidea/lang/psi/WingVisitor.java
similarity index 99%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingVisitor.java
rename to gen/com/github/wingidea/lang/psi/WingVisitor.java
index 3c51bf1..66cf511 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingVisitor.java
+++ b/gen/com/github/wingidea/lang/psi/WingVisitor.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import org.jetbrains.annotations.*;
 import com.intellij.psi.PsiElementVisitor;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/WingWhileStatement.java b/gen/com/github/wingidea/lang/psi/WingWhileStatement.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/WingWhileStatement.java
rename to gen/com/github/wingidea/lang/psi/WingWhileStatement.java
index edcf153..2477902 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/WingWhileStatement.java
+++ b/gen/com/github/wingidea/lang/psi/WingWhileStatement.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi;
+package com.github.wingidea.lang.psi;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAccessModifierImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingAccessModifierImpl.java
similarity index 79%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAccessModifierImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingAccessModifierImpl.java
index 8e9e285..d004c9a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAccessModifierImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingAccessModifierImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingAccessModifierImpl extends WingElementImpl implements WingAccessModifier {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAccessorImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingAccessorImpl.java
similarity index 79%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAccessorImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingAccessorImpl.java
index 6456d03..3fb9ffa 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAccessorImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingAccessorImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingAccessorImpl extends WingElementImpl implements WingAccessor {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArgumentImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingArgumentImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArgumentImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingArgumentImpl.java
index 838090a..fa320fe 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArgumentImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingArgumentImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingArgumentImpl extends WingElementImpl implements WingArgument {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArgumentListImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingArgumentListImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArgumentListImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingArgumentListImpl.java
index a1b083b..bcadca2 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArgumentListImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingArgumentListImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingArgumentListImpl extends WingElementImpl implements WingArgumentList {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArrayLiteralExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingArrayLiteralExpressionImpl.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArrayLiteralExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingArrayLiteralExpressionImpl.java
index a247b41..a6472bd 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingArrayLiteralExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingArrayLiteralExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingArrayLiteralExpressionImpl extends WingExpressionImpl implements WingArrayLiteralExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAwaitExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingAwaitExpressionImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAwaitExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingAwaitExpressionImpl.java
index 73c6283..d8aaff1 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingAwaitExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingAwaitExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingAwaitExpressionImpl extends WingExpressionImpl implements WingAwaitExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBinaryExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingBinaryExpressionImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBinaryExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingBinaryExpressionImpl.java
index f3455df..3a14277 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBinaryExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingBinaryExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingBinaryExpressionImpl extends WingExpressionImpl implements WingBinaryExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBlockStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingBlockStatementImpl.java
similarity index 95%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBlockStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingBlockStatementImpl.java
index 0f2f633..f9f2741 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBlockStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingBlockStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingBlockStatementImpl extends WingElementImpl implements WingBlockStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBreakStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingBreakStatementImpl.java
similarity index 79%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBreakStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingBreakStatementImpl.java
index 5b1c2e9..3dca42a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingBreakStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingBreakStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingBreakStatementImpl extends WingElementImpl implements WingBreakStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCallExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingCallExpressionImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCallExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingCallExpressionImpl.java
index 305ebbf..5b4d6a1 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCallExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingCallExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingCallExpressionImpl extends WingExpressionImpl implements WingCallExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCatchBlockImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingCatchBlockImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCatchBlockImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingCatchBlockImpl.java
index ce36d65..b673209 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCatchBlockImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingCatchBlockImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingCatchBlockImpl extends WingElementImpl implements WingCatchBlock {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassDefinitionStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingClassDefinitionStatementImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassDefinitionStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingClassDefinitionStatementImpl.java
index 74badef..0757027 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassDefinitionStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingClassDefinitionStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingClassDefinitionStatementImpl extends WingElementImpl implements WingClassDefinitionStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassFieldImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingClassFieldImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassFieldImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingClassFieldImpl.java
index 08ae1c0..ce117ca 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassFieldImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingClassFieldImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingClassFieldImpl extends WingElementImpl implements WingClassField {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassImplementationImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingClassImplementationImpl.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassImplementationImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingClassImplementationImpl.java
index c639c23..cdfcba1 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingClassImplementationImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingClassImplementationImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingClassImplementationImpl extends WingElementImpl implements WingClassImplementation {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCollectionLiteralExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingCollectionLiteralExpressionImpl.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCollectionLiteralExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingCollectionLiteralExpressionImpl.java
index 2519715..452eae9 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingCollectionLiteralExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingCollectionLiteralExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public abstract class WingCollectionLiteralExpressionImpl extends WingExpressionImpl implements WingCollectionLiteralExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingContainerValueTypeImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingContainerValueTypeImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingContainerValueTypeImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingContainerValueTypeImpl.java
index 4306e6d..828b76f 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingContainerValueTypeImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingContainerValueTypeImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingContainerValueTypeImpl extends WingElementImpl implements WingContainerValueType {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingContinueStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingContinueStatementImpl.java
similarity index 80%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingContinueStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingContinueStatementImpl.java
index 4a99bb9..2d807f5 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingContinueStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingContinueStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingContinueStatementImpl extends WingElementImpl implements WingContinueStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingDeferExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingDeferExpressionImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingDeferExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingDeferExpressionImpl.java
index 402e35e..b7d22a7 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingDeferExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingDeferExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingDeferExpressionImpl extends WingExpressionImpl implements WingDeferExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingDurationImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingDurationImpl.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingDurationImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingDurationImpl.java
index c191e3d..d85d590 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingDurationImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingDurationImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingDurationImpl extends WingElementImpl implements WingDuration {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingElIfBlockImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingElIfBlockImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingElIfBlockImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingElIfBlockImpl.java
index 0cc012e..5f9863d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingElIfBlockImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingElIfBlockImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingElIfBlockImpl extends WingElementImpl implements WingElIfBlock {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingEnumDefinitionStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingEnumDefinitionStatementImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingEnumDefinitionStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingEnumDefinitionStatementImpl.java
index f9af4bd..bb9ecae 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingEnumDefinitionStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingEnumDefinitionStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingEnumDefinitionStatementImpl extends WingElementImpl implements WingEnumDefinitionStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingEnumFieldImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingEnumFieldImpl.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingEnumFieldImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingEnumFieldImpl.java
index 3546636..494057c 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingEnumFieldImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingEnumFieldImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingEnumFieldImpl extends WingElementImpl implements WingEnumField {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingExpressionImpl.java
similarity index 79%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingExpressionImpl.java
index 5853a2d..485213d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public abstract class WingExpressionImpl extends WingElementImpl implements WingExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExpressionStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingExpressionStatementImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExpressionStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingExpressionStatementImpl.java
index 070d4b0..381977e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExpressionStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingExpressionStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingExpressionStatementImpl extends WingElementImpl implements WingExpressionStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExternModifierImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingExternModifierImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExternModifierImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingExternModifierImpl.java
index 7a4592a..6e4d612 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingExternModifierImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingExternModifierImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingExternModifierImpl extends WingElementImpl implements WingExternModifier {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingFinallyBlockImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingFinallyBlockImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingFinallyBlockImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingFinallyBlockImpl.java
index d9ab6ce..d39f11b 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingFinallyBlockImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingFinallyBlockImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingFinallyBlockImpl extends WingElementImpl implements WingFinallyBlock {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingForInLoopStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingForInLoopStatementImpl.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingForInLoopStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingForInLoopStatementImpl.java
index e873086..5e53228 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingForInLoopStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingForInLoopStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingForInLoopStatementImpl extends WingElementImpl implements WingForInLoopStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingFunctionTypeImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingFunctionTypeImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingFunctionTypeImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingFunctionTypeImpl.java
index e5e4516..5f8fe83 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingFunctionTypeImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingFunctionTypeImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingFunctionTypeImpl extends WingElementImpl implements WingFunctionType {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingIfLetStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingIfLetStatementImpl.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingIfLetStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingIfLetStatementImpl.java
index 220efc8..70c4f72 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingIfLetStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingIfLetStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingIfLetStatementImpl extends WingElementImpl implements WingIfLetStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingIfStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingIfStatementImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingIfStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingIfStatementImpl.java
index 0a021d9..ee014bf 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingIfStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingIfStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingIfStatementImpl extends WingElementImpl implements WingIfStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingImportStatementBlockImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingImportStatementBlockImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingImportStatementBlockImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingImportStatementBlockImpl.java
index 1637138..0b86034 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingImportStatementBlockImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingImportStatementBlockImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingImportStatementBlockImpl extends WingElementImpl implements WingImportStatementBlock {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingImportStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingImportStatementImpl.java
similarity index 79%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingImportStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingImportStatementImpl.java
index 3bcd78b..9450860 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingImportStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingImportStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingImportStatementImpl extends WingElementImpl implements WingImportStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightClosureExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingInflightClosureExpressionImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightClosureExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingInflightClosureExpressionImpl.java
index 2c5f112..e9fff9c 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightClosureExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingInflightClosureExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingInflightClosureExpressionImpl extends WingExpressionImpl implements WingInflightClosureExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightMethodDefinitionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingInflightMethodDefinitionImpl.java
similarity index 89%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightMethodDefinitionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingInflightMethodDefinitionImpl.java
index a4faf7a..15e5ba0 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightMethodDefinitionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingInflightMethodDefinitionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingInflightMethodDefinitionImpl extends WingElementImpl implements WingInflightMethodDefinition {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightMethodSignatureImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingInflightMethodSignatureImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightMethodSignatureImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingInflightMethodSignatureImpl.java
index f39e146..91ddd4d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInflightMethodSignatureImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingInflightMethodSignatureImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingInflightMethodSignatureImpl extends WingElementImpl implements WingInflightMethodSignature {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInitializerImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingInitializerImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInitializerImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingInitializerImpl.java
index 0e6ce81..90ef6a0 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInitializerImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingInitializerImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingInitializerImpl extends WingElementImpl implements WingInitializer {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInterfaceDefinitionStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingInterfaceDefinitionStatementImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInterfaceDefinitionStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingInterfaceDefinitionStatementImpl.java
index cb43627..ddcbf2d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInterfaceDefinitionStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingInterfaceDefinitionStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingInterfaceDefinitionStatementImpl extends WingElementImpl implements WingInterfaceDefinitionStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInterfaceImplementationImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingInterfaceImplementationImpl.java
similarity index 87%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInterfaceImplementationImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingInterfaceImplementationImpl.java
index b79eacf..05a7125 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingInterfaceImplementationImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingInterfaceImplementationImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingInterfaceImplementationImpl extends WingElementImpl implements WingInterfaceImplementation {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonLiteralExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingJsonLiteralExpressionImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonLiteralExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingJsonLiteralExpressionImpl.java
index b640984..62cb313 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonLiteralExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingJsonLiteralExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingJsonLiteralExpressionImpl extends WingExpressionImpl implements WingJsonLiteralExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonMapLiteralImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingJsonMapLiteralImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonMapLiteralImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingJsonMapLiteralImpl.java
index 54267a6..1e75b04 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonMapLiteralImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingJsonMapLiteralImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingJsonMapLiteralImpl extends WingElementImpl implements WingJsonMapLiteral {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonMapLiteralMemberImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingJsonMapLiteralMemberImpl.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonMapLiteralMemberImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingJsonMapLiteralMemberImpl.java
index f9f83a3..c22453a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingJsonMapLiteralMemberImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingJsonMapLiteralMemberImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingJsonMapLiteralMemberImpl extends WingElementImpl implements WingJsonMapLiteralMember {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLiteralExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingLiteralExpressionImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLiteralExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingLiteralExpressionImpl.java
index d4014a1..b52d7f9 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLiteralExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingLiteralExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingLiteralExpressionImpl extends WingExpressionImpl implements WingLiteralExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLogicalOperatorsImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingLogicalOperatorsImpl.java
similarity index 79%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLogicalOperatorsImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingLogicalOperatorsImpl.java
index 42670d0..179f900 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLogicalOperatorsImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingLogicalOperatorsImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingLogicalOperatorsImpl extends WingElementImpl implements WingLogicalOperators {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLoopRangeImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingLoopRangeImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLoopRangeImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingLoopRangeImpl.java
index 49df994..6a2c56e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingLoopRangeImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingLoopRangeImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingLoopRangeImpl extends WingElementImpl implements WingLoopRange {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMapLiteralExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingMapLiteralExpressionImpl.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMapLiteralExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingMapLiteralExpressionImpl.java
index 7d737bb..50a7114 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMapLiteralExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingMapLiteralExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingMapLiteralExpressionImpl extends WingExpressionImpl implements WingMapLiteralExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMapLiteralMemberImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingMapLiteralMemberImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMapLiteralMemberImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingMapLiteralMemberImpl.java
index 1b0ccaa..031db7a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMapLiteralMemberImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingMapLiteralMemberImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingMapLiteralMemberImpl extends WingElementImpl implements WingMapLiteralMember {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMathematicalOperatorsImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingMathematicalOperatorsImpl.java
similarity index 80%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMathematicalOperatorsImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingMathematicalOperatorsImpl.java
index 1bff4bf..6e38af7 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMathematicalOperatorsImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingMathematicalOperatorsImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingMathematicalOperatorsImpl extends WingElementImpl implements WingMathematicalOperators {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMethodDefinitionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingMethodDefinitionImpl.java
similarity index 89%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMethodDefinitionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingMethodDefinitionImpl.java
index caf531c..bf69d86 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMethodDefinitionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingMethodDefinitionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingMethodDefinitionImpl extends WingElementImpl implements WingMethodDefinition {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMethodSignatureImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingMethodSignatureImpl.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMethodSignatureImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingMethodSignatureImpl.java
index 70ebe46..080972c 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingMethodSignatureImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingMethodSignatureImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingMethodSignatureImpl extends WingElementImpl implements WingMethodSignature {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNestedIdentifierExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingNestedIdentifierExpressionImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNestedIdentifierExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingNestedIdentifierExpressionImpl.java
index 48be5bd..c45dfc7 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNestedIdentifierExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingNestedIdentifierExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingNestedIdentifierExpressionImpl extends WingExpressionImpl implements WingNestedIdentifierExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNestedIdentifierJsonExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingNestedIdentifierJsonExpressionImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNestedIdentifierJsonExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingNestedIdentifierJsonExpressionImpl.java
index f2d31b8..25eb9a4 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNestedIdentifierJsonExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingNestedIdentifierJsonExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingNestedIdentifierJsonExpressionImpl extends WingExpressionImpl implements WingNestedIdentifierJsonExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNewExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingNewExpressionImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNewExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingNewExpressionImpl.java
index 2471b53..27a3a88 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNewExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingNewExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingNewExpressionImpl extends WingExpressionImpl implements WingNewExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNumberImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingNumberImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNumberImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingNumberImpl.java
index c505ef6..e42c102 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingNumberImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingNumberImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingNumberImpl extends WingElementImpl implements WingNumber {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingOperatorsImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingOperatorsImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingOperatorsImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingOperatorsImpl.java
index 088ff82..da6a544 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingOperatorsImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingOperatorsImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingOperatorsImpl extends WingElementImpl implements WingOperators {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingOptionalTestExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingOptionalTestExpressionImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingOptionalTestExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingOptionalTestExpressionImpl.java
index 1d14695..07f982a 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingOptionalTestExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingOptionalTestExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingOptionalTestExpressionImpl extends WingExpressionImpl implements WingOptionalTestExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterDefinitionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingParameterDefinitionImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterDefinitionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingParameterDefinitionImpl.java
index f3d647b..2444b90 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterDefinitionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingParameterDefinitionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingParameterDefinitionImpl extends WingElementImpl implements WingParameterDefinition {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterListImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingParameterListImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterListImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingParameterListImpl.java
index 7d81f5d..86a62ac 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterListImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingParameterListImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingParameterListImpl extends WingElementImpl implements WingParameterList {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterTypeListImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingParameterTypeListImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterTypeListImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingParameterTypeListImpl.java
index 706940e..8dd86ad 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParameterTypeListImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingParameterTypeListImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingParameterTypeListImpl extends WingElementImpl implements WingParameterTypeList {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParenthesizedExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingParenthesizedExpressionImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParenthesizedExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingParenthesizedExpressionImpl.java
index 96b1a71..a9036f5 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingParenthesizedExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingParenthesizedExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingParenthesizedExpressionImpl extends WingExpressionImpl implements WingParenthesizedExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingPreflightClosureExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingPreflightClosureExpressionImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingPreflightClosureExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingPreflightClosureExpressionImpl.java
index 914c728..f5cba61 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingPreflightClosureExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingPreflightClosureExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingPreflightClosureExpressionImpl extends WingExpressionImpl implements WingPreflightClosureExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingReferenceExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingReferenceExpressionImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingReferenceExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingReferenceExpressionImpl.java
index 94dfb67..b5b87f2 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingReferenceExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingReferenceExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingReferenceExpressionImpl extends WingExpressionImpl implements WingReferenceExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingRelationalOperatorsImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingRelationalOperatorsImpl.java
similarity index 80%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingRelationalOperatorsImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingRelationalOperatorsImpl.java
index a1c93c0..8e8a24d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingRelationalOperatorsImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingRelationalOperatorsImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingRelationalOperatorsImpl extends WingElementImpl implements WingRelationalOperators {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingResourceDefinitionStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingResourceDefinitionStatementImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingResourceDefinitionStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingResourceDefinitionStatementImpl.java
index 33ca606..3070753 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingResourceDefinitionStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingResourceDefinitionStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingResourceDefinitionStatementImpl extends WingElementImpl implements WingResourceDefinitionStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingResourceImplementationImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingResourceImplementationImpl.java
similarity index 88%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingResourceImplementationImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingResourceImplementationImpl.java
index a3ea249..4671fac 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingResourceImplementationImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingResourceImplementationImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingResourceImplementationImpl extends WingElementImpl implements WingResourceImplementation {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingReturnStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingReturnStatementImpl.java
similarity index 82%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingReturnStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingReturnStatementImpl.java
index 68a014b..a8342d3 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingReturnStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingReturnStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingReturnStatementImpl extends WingElementImpl implements WingReturnStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSetLiteralExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingSetLiteralExpressionImpl.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSetLiteralExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingSetLiteralExpressionImpl.java
index 4d1ba28..ae1e05b 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSetLiteralExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingSetLiteralExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingSetLiteralExpressionImpl extends WingExpressionImpl implements WingSetLiteralExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStringImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingStringImpl.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStringImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingStringImpl.java
index 984e45e..4f180b7 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStringImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingStringImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingStringImpl extends WingElementImpl implements WingString {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructDefinitionStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingStructDefinitionStatementImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructDefinitionStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingStructDefinitionStatementImpl.java
index c24514e..59f1ea5 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructDefinitionStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingStructDefinitionStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingStructDefinitionStatementImpl extends WingElementImpl implements WingStructDefinitionStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructFieldImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingStructFieldImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructFieldImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingStructFieldImpl.java
index 3e69273..103aeee 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructFieldImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingStructFieldImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingStructFieldImpl extends WingElementImpl implements WingStructField {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructLiteralExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingStructLiteralExpressionImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructLiteralExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingStructLiteralExpressionImpl.java
index 8b1cd8b..c3ece29 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructLiteralExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingStructLiteralExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingStructLiteralExpressionImpl extends WingExpressionImpl implements WingStructLiteralExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructLiteralMemberImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingStructLiteralMemberImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructLiteralMemberImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingStructLiteralMemberImpl.java
index 0f0835f..5035aa4 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructLiteralMemberImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingStructLiteralMemberImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingStructLiteralMemberImpl extends WingElementImpl implements WingStructLiteralMember {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructuredAccessExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingStructuredAccessExpressionImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructuredAccessExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingStructuredAccessExpressionImpl.java
index d746a59..bb687c3 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingStructuredAccessExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingStructuredAccessExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingStructuredAccessExpressionImpl extends WingExpressionImpl implements WingStructuredAccessExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSuperCallExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingSuperCallExpressionImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSuperCallExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingSuperCallExpressionImpl.java
index adbf40d..deff5d4 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSuperCallExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingSuperCallExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingSuperCallExpressionImpl extends WingExpressionImpl implements WingSuperCallExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSuperConstructorStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingSuperConstructorStatementImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSuperConstructorStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingSuperConstructorStatementImpl.java
index a6a823b..c4bc8be 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingSuperConstructorStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingSuperConstructorStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingSuperConstructorStatementImpl extends WingElementImpl implements WingSuperConstructorStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTestStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingTestStatementImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTestStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingTestStatementImpl.java
index 7c1b204..f09e416 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTestStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingTestStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingTestStatementImpl extends WingElementImpl implements WingTestStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTryCatchStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingTryCatchStatementImpl.java
similarity index 85%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTryCatchStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingTryCatchStatementImpl.java
index 1a13b4a..8e4c4cf 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTryCatchStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingTryCatchStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingTryCatchStatementImpl extends WingElementImpl implements WingTryCatchStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTypeAnnotationImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingTypeAnnotationImpl.java
similarity index 81%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTypeAnnotationImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingTypeAnnotationImpl.java
index 9ad4fc8..9404774 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTypeAnnotationImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingTypeAnnotationImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingTypeAnnotationImpl extends WingElementImpl implements WingTypeAnnotation {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTypeImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingTypeImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTypeImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingTypeImpl.java
index b3f454b..c331967 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingTypeImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingTypeImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingTypeImpl extends WingElementImpl implements WingType {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingUnaryExpressionImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingUnaryExpressionImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingUnaryExpressionImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingUnaryExpressionImpl.java
index 9e23779..2ed53e7 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingUnaryExpressionImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingUnaryExpressionImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingUnaryExpressionImpl extends WingExpressionImpl implements WingUnaryExpression {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingUnaryOperatorsImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingUnaryOperatorsImpl.java
similarity index 79%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingUnaryOperatorsImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingUnaryOperatorsImpl.java
index 04ffe75..2c75cf3 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingUnaryOperatorsImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingUnaryOperatorsImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingUnaryOperatorsImpl extends WingElementImpl implements WingUnaryOperators {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingVariableAssignmentStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingVariableAssignmentStatementImpl.java
similarity index 83%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingVariableAssignmentStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingVariableAssignmentStatementImpl.java
index 2d4e80e..d46851d 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingVariableAssignmentStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingVariableAssignmentStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingVariableAssignmentStatementImpl extends WingElementImpl implements WingVariableAssignmentStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingVariableDefinitionStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingVariableDefinitionStatementImpl.java
similarity index 86%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingVariableDefinitionStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingVariableDefinitionStatementImpl.java
index ffed955..e15976e 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingVariableDefinitionStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingVariableDefinitionStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingVariableDefinitionStatementImpl extends WingElementImpl implements WingVariableDefinitionStatement {
 
diff --git a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingWhileStatementImpl.java b/gen/com/github/wingidea/lang/psi/impl/WingWhileStatementImpl.java
similarity index 84%
rename from gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingWhileStatementImpl.java
rename to gen/com/github/wingidea/lang/psi/impl/WingWhileStatementImpl.java
index 3449445..434dd96 100644
--- a/gen/com/github/olivernybroe/wingidea/lang/psi/impl/WingWhileStatementImpl.java
+++ b/gen/com/github/wingidea/lang/psi/impl/WingWhileStatementImpl.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package com.github.olivernybroe.wingidea.lang.psi.impl;
+package com.github.wingidea.lang.psi.impl;
 
 import java.util.List;
 import org.jetbrains.annotations.*;
@@ -7,8 +7,8 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
-import com.github.olivernybroe.wingidea.lang.psi.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
+import com.github.wingidea.lang.psi.*;
 
 public class WingWhileStatementImpl extends WingElementImpl implements WingWhileStatement {
 
diff --git a/gradle.properties b/gradle.properties
index 1f19ffa..a72b312 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,31 +2,35 @@
 
 pluginGroup = com.github.olivernybroe.wingidea
 pluginName = Wing
-pluginRepositoryUrl = https://github.com/olivernybroe/Wing-Idea
+pluginRepositoryUrl = https://github.com/Szasza/Wing-Idea
 # SemVer format -> https://semver.org
 pluginVersion = 0.1.6
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 241
-pluginUntilBuild = 241.*
+pluginUntilBuild = 251.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IU
 platformVersion = 241-EAP-SNAPSHOT
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
+# Example: platformPlugins = com.jetbrains.php:203.4449.22
 # https://plugins.jetbrains.com/plugin/227-psiviewer/versions
-platformPlugins =JavaScript, PsiViewer:241.14494.158-EAP-SNAPSHOT
+platformPlugins = PsiViewer:241.14494.158-EAP-SNAPSHOT
+# Example: platformBundledPlugins = com.intellij.java
+platformBundledPlugins = JavaScript
+
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.2.1
+gradleVersion = 8.12
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false
 
 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
 org.gradle.configuration-cache = true
+org.gradle.configuration-cache.parallel = true
 
 # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching = true
@@ -34,4 +38,4 @@ org.gradle.caching = true
 # Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
 systemProp.org.gradle.unsafe.kotlin.assignment = true
 
-ktorVersion=2.3.3
+ktorVersion=2.3.13
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 76e119e..a222552 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,20 +1,22 @@
 [versions]
 # libraries
 annotations = "24.1.0"
+junit = "4.13.2"
 
 # plugins
 kotlin = "1.9.24"
 changelog = "2.2.1"
-gradleIntelliJPlugin = "1.17.3"
-qodana = "0.1.13"
+gradleIntelliJPlugin = "2.2.1"
+qodana = "2024.1.11"
 kover = "0.7.6"
 
 [libraries]
 annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
-gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij.platform", version.ref = "gradleIntelliJPlugin" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d..cea7a79 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index fcb6fca..f5feea6 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..9d21a21 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/grammars/Wing.bnf b/grammars/Wing.bnf
index 370e71b..9f00ef6 100644
--- a/grammars/Wing.bnf
+++ b/grammars/Wing.bnf
@@ -1,27 +1,27 @@
 {
   //noinspection BnfResolve
-  parserClass='com.github.olivernybroe.wingidea.lang.parser.WingParser'
+  parserClass='com.github.wingidea.lang.parser.WingParser'
   //noinspection BnfResolve
-  parserUtilClass='com.github.olivernybroe.wingidea.lang.parser.WingParserUtil'
+  parserUtilClass='com.github.wingidea.lang.parser.WingParserUtil'
 
   //noinspection BnfResolve
-  implements='com.github.olivernybroe.wingidea.lang.psi.WingElement'
+  implements='com.github.wingidea.lang.psi.WingElement'
   //noinspection BnfResolve
-  extends='com.github.olivernybroe.wingidea.lang.psi.impl.WingElementImpl'
+  extends='com.github.wingidea.lang.psi.impl.WingElementImpl'
 
   //noinspection BnfResolve
-  elementTypeHolderClass='com.github.olivernybroe.wingidea.lang.psi.WingElementTypes'
+  elementTypeHolderClass='com.github.wingidea.lang.psi.WingElementTypes'
   //noinspection BnfResolve
-  elementTypeClass='com.github.olivernybroe.wingidea.lang.psi.WingElementType'
+  elementTypeClass='com.github.wingidea.lang.psi.WingElementType'
   //noinspection BnfResolve
-  tokenTypeClass='com.github.olivernybroe.wingidea.lang.psi.WingTokenType'
+  tokenTypeClass='com.github.wingidea.lang.psi.WingTokenType'
 
   psiClassPrefix='Wing'
   psiImplClassSuffix='Impl'
   //noinspection BnfResolve
-  psiPackage='com.github.olivernybroe.wingidea.lang.psi'
+  psiPackage='com.github.wingidea.lang.psi'
   //noinspection BnfResolve
-  psiImplPackage='com.github.olivernybroe.wingidea.lang.psi.impl'
+  psiImplPackage='com.github.wingidea.lang.psi.impl'
 
   tokens = [
     INFLIGHT_SPECIFIER = 'inflight'
diff --git a/grammars/Wing.flex b/grammars/Wing.flex
index a1019ba..f9efc22 100644
--- a/grammars/Wing.flex
+++ b/grammars/Wing.flex
@@ -1,11 +1,11 @@
-package com.github.olivernybroe.wingidea.lang.parser;
+package com.github.wingidea.lang.parser;
 
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
 
 import static com.intellij.psi.TokenType.BAD_CHARACTER;
 import static com.intellij.psi.TokenType.WHITE_SPACE;
-import static com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*;
+import static com.github.wingidea.lang.psi.WingElementTypes.*;
 
 %%
 
diff --git a/qodana.yml b/qodana.yml
index f388de9..4b6922e 100644
--- a/qodana.yml
+++ b/qodana.yml
@@ -2,7 +2,7 @@
 # https://www.jetbrains.com/help/qodana/qodana-yaml.html
 
 version: 1.0
-linter: jetbrains/qodana-jvm-community:latest
+linter: jetbrains/qodana-jvm-community:2024.3
 projectJDK: 17
 profile:
   name: qodana.recommended
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 36e2d71..78dc7d6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1 +1,5 @@
 rootProject.name = "Wing-Idea"
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/WingLanguage.kt b/src/main/kotlin/com/github/olivernybroe/wingidea/lang/WingLanguage.kt
deleted file mode 100644
index 4a4078c..0000000
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/WingLanguage.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.github.olivernybroe.wingidea.lang
-
-import com.intellij.lang.Language
-
-object WingLanguage: Language("Wing") {
-}
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/VirtualFileExtensions.kt b/src/main/kotlin/com/github/wingidea/VirtualFileExtensions.kt
similarity index 76%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/VirtualFileExtensions.kt
rename to src/main/kotlin/com/github/wingidea/VirtualFileExtensions.kt
index 0b5e716..dcf7bcd 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/VirtualFileExtensions.kt
+++ b/src/main/kotlin/com/github/wingidea/VirtualFileExtensions.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea
+package com.github.wingidea
 
 import com.intellij.openapi.vfs.VirtualFile
 
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/WingBundle.kt b/src/main/kotlin/com/github/wingidea/WingBundle.kt
similarity index 93%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/WingBundle.kt
rename to src/main/kotlin/com/github/wingidea/WingBundle.kt
index 46116bb..d86b533 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/WingBundle.kt
+++ b/src/main/kotlin/com/github/wingidea/WingBundle.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea
+package com.github.wingidea
 
 import com.intellij.DynamicBundle
 import org.jetbrains.annotations.NonNls
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/WingIcons.kt b/src/main/kotlin/com/github/wingidea/WingIcons.kt
similarity index 79%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/WingIcons.kt
rename to src/main/kotlin/com/github/wingidea/WingIcons.kt
index 7f80c01..f89729a 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/WingIcons.kt
+++ b/src/main/kotlin/com/github/wingidea/WingIcons.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea
+package com.github.wingidea
 
 class WingIcons {
     companion object {
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/WingCommandLine.kt b/src/main/kotlin/com/github/wingidea/ide/WingCommandLine.kt
similarity index 67%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/WingCommandLine.kt
rename to src/main/kotlin/com/github/wingidea/ide/WingCommandLine.kt
index a384eec..f825131 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/WingCommandLine.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/WingCommandLine.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide
+package com.github.wingidea.ide
 
 import com.intellij.execution.ExecutionException
 import com.intellij.execution.configurations.GeneralCommandLine
@@ -17,26 +17,29 @@ import com.intellij.openapi.project.Project
 class WingCommandLine {
 
     companion object {
-        fun createCommand(project: Project, vararg commands: String): GeneralCommandLine {
+        private fun createCommand(project: Project, vararg commands: String): GeneralCommandLine {
             val interpreter = NodeJsInterpreterManager.getInstance(project).interpreter
             if (interpreter !is NodeJsLocalInterpreter && interpreter !is WslNodeInterpreter) {
                 // shouldn't happen, checked in PrismaLspServerSupportProvider
-                throw ExecutionException("Not configured")
+                throw ExecutionException("NodeJS/WSL interpreter is not configured for the project, the LSP server cannot be started.")
             }
 
             val npmPath = NpmManager.getInstance(project).getPackage(interpreter)!!.systemDependentPath
+            val nodeBinPath = npmPath.replaceAfterLast("/", "").replaceAfterLast("\\", "").trimEnd('/','\\')
+            val cmdLine = GeneralCommandLine("wing")
+            val envPath = cmdLine.parentEnvironment["PATH"]
 
-            return GeneralCommandLine().apply {
+            return cmdLine.apply {
                 withParentEnvironmentType(GeneralCommandLine.ParentEnvironmentType.CONSOLE)
+                withEnvironment(parentEnvironment)
+                withEnvironment("PATH", "$envPath:$nodeBinPath")
                 withCharset(Charsets.UTF_8)
                 withWorkDirectory(project.basePath)
-                withExePath(npmPath.replaceAfterLast("/", "npx").replaceAfterLast("\\", "npx.cmd"))
-                addParameter("wing")
                 addParameters(*commands)
             }
         }
 
-        fun createLsp(project: Project): GeneralCommandLine = createCommand(project, "lsp")
+        fun createLsp(project: Project): GeneralCommandLine = createCommand(project, "lsp", "--no-update-check")
         fun createConsole(project: Project): GeneralCommandLine = createCommand(project, "it", "--no-open")
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/WingFileChangedListener.kt b/src/main/kotlin/com/github/wingidea/ide/WingFileChangedListener.kt
similarity index 66%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/WingFileChangedListener.kt
rename to src/main/kotlin/com/github/wingidea/ide/WingFileChangedListener.kt
index cfd10d3..87f3d68 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/WingFileChangedListener.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/WingFileChangedListener.kt
@@ -1,24 +1,15 @@
-package com.github.olivernybroe.wingidea.ide
+package com.github.wingidea.ide
 
-import com.github.olivernybroe.wingidea.ide.services.WingConsoleManager
-import com.github.olivernybroe.wingidea.lang.WingFileType
+import com.github.wingidea.ide.services.WingConsoleManager
+import com.github.wingidea.lang.WingFileType
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.invokeLater
-import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.components.service
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent
 import com.intellij.openapi.fileEditor.FileEditorManagerListener
-import com.intellij.openapi.progress.ProgressManager
-import com.intellij.openapi.progress.runBackgroundableTask
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.util.concurrency.executeOnPooledIoThread
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 
 class WingFileChangedListener: Disposable, FileEditorManagerListener {
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingBraceMatcher.kt b/src/main/kotlin/com/github/wingidea/ide/editor/WingBraceMatcher.kt
similarity index 89%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingBraceMatcher.kt
rename to src/main/kotlin/com/github/wingidea/ide/editor/WingBraceMatcher.kt
index 917b662..db0233e 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingBraceMatcher.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/editor/WingBraceMatcher.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.ide.editor
+package com.github.wingidea.ide.editor
 
-import com.github.olivernybroe.wingidea.lang.psi.WingElementTypes
+import com.github.wingidea.lang.psi.WingElementTypes
 import com.intellij.lang.BracePair
 import com.intellij.lang.PairedBraceMatcher
 import com.intellij.psi.PsiFile
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingCommenter.kt b/src/main/kotlin/com/github/wingidea/ide/editor/WingCommenter.kt
similarity index 87%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingCommenter.kt
rename to src/main/kotlin/com/github/wingidea/ide/editor/WingCommenter.kt
index 00aef32..f0573b8 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingCommenter.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/editor/WingCommenter.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide.editor
+package com.github.wingidea.ide.editor
 
 import com.intellij.lang.Commenter
 
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingQuoteHandler.kt b/src/main/kotlin/com/github/wingidea/ide/editor/WingQuoteHandler.kt
similarity index 54%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingQuoteHandler.kt
rename to src/main/kotlin/com/github/wingidea/ide/editor/WingQuoteHandler.kt
index 44bd58b..cc2c2b9 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/editor/WingQuoteHandler.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/editor/WingQuoteHandler.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.ide.editor
+package com.github.wingidea.ide.editor
 
-import com.github.olivernybroe.wingidea.lang.psi.WING_STRINGS
+import com.github.wingidea.lang.psi.WING_STRINGS
 import com.intellij.codeInsight.editorActions.SimpleTokenSetQuoteHandler
 
 class WingQuoteHandler: SimpleTokenSetQuoteHandler(WING_STRINGS)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/folding/WingBlockFoldingBuilder.kt b/src/main/kotlin/com/github/wingidea/ide/folding/WingBlockFoldingBuilder.kt
similarity index 81%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/folding/WingBlockFoldingBuilder.kt
rename to src/main/kotlin/com/github/wingidea/ide/folding/WingBlockFoldingBuilder.kt
index a3a8af8..6c5cbc7 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/folding/WingBlockFoldingBuilder.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/folding/WingBlockFoldingBuilder.kt
@@ -1,7 +1,7 @@
-package com.github.olivernybroe.wingidea.ide.folding
+package com.github.wingidea.ide.folding
 
-import com.github.olivernybroe.wingidea.lang.psi.WingBlockStatement
-import com.github.olivernybroe.wingidea.lang.psi.WingResourceImplementation
+import com.github.wingidea.lang.psi.WingBlockStatement
+import com.github.wingidea.lang.psi.WingResourceImplementation
 import com.intellij.lang.ASTNode
 import com.intellij.lang.folding.FoldingBuilderEx
 import com.intellij.lang.folding.FoldingDescriptor
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/folding/WingImportFoldingBuilder.kt b/src/main/kotlin/com/github/wingidea/ide/folding/WingImportFoldingBuilder.kt
similarity index 87%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/folding/WingImportFoldingBuilder.kt
rename to src/main/kotlin/com/github/wingidea/ide/folding/WingImportFoldingBuilder.kt
index 4d211d8..9784737 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/folding/WingImportFoldingBuilder.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/folding/WingImportFoldingBuilder.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.ide.folding
+package com.github.wingidea.ide.folding
 
-import com.github.olivernybroe.wingidea.lang.psi.WingImportStatementBlock
+import com.github.wingidea.lang.psi.WingImportStatementBlock
 import com.intellij.lang.ASTNode
 import com.intellij.lang.folding.FoldingBuilderEx
 import com.intellij.lang.folding.FoldingDescriptor
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/WingFormatBlock.kt b/src/main/kotlin/com/github/wingidea/ide/formatter/WingFormatBlock.kt
similarity index 90%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/WingFormatBlock.kt
rename to src/main/kotlin/com/github/wingidea/ide/formatter/WingFormatBlock.kt
index b05e305..e2a10fb 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/WingFormatBlock.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/formatter/WingFormatBlock.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide.formatter
+package com.github.wingidea.ide.formatter
 
 import com.intellij.formatting.*
 import com.intellij.lang.ASTNode
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/WingFormattingModelBuilder.kt b/src/main/kotlin/com/github/wingidea/ide/formatter/WingFormattingModelBuilder.kt
similarity index 92%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/WingFormattingModelBuilder.kt
rename to src/main/kotlin/com/github/wingidea/ide/formatter/WingFormattingModelBuilder.kt
index 8e5fc98..913bef7 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/WingFormattingModelBuilder.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/formatter/WingFormattingModelBuilder.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide.formatter
+package com.github.wingidea.ide.formatter
 
 import com.intellij.formatting.FormattingContext
 import com.intellij.formatting.FormattingModel
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/settings/WingLanguageCodeStyleSettingsProvider.kt b/src/main/kotlin/com/github/wingidea/ide/formatter/settings/WingLanguageCodeStyleSettingsProvider.kt
similarity index 92%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/settings/WingLanguageCodeStyleSettingsProvider.kt
rename to src/main/kotlin/com/github/wingidea/ide/formatter/settings/WingLanguageCodeStyleSettingsProvider.kt
index d935140..55871e4 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/formatter/settings/WingLanguageCodeStyleSettingsProvider.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/formatter/settings/WingLanguageCodeStyleSettingsProvider.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.ide.formatter.settings
+package com.github.wingidea.ide.formatter.settings
 
-import com.github.olivernybroe.wingidea.lang.WingLanguage
+import com.github.wingidea.lang.WingLanguage
 import com.intellij.lang.Language
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider
 
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingColorSettingsPage.kt b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingColorSettingsPage.kt
similarity index 94%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingColorSettingsPage.kt
rename to src/main/kotlin/com/github/wingidea/ide/highlighting/WingColorSettingsPage.kt
index 5f7ccc1..56ec01d 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingColorSettingsPage.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingColorSettingsPage.kt
@@ -1,8 +1,8 @@
-package com.github.olivernybroe.wingidea.ide.highlighting
+package com.github.wingidea.ide.highlighting
 
-import com.github.olivernybroe.wingidea.WingBundle
-import com.github.olivernybroe.wingidea.WingIcons
-import com.github.olivernybroe.wingidea.lang.WingLanguage
+import com.github.wingidea.WingBundle
+import com.github.wingidea.WingIcons
+import com.github.wingidea.lang.WingLanguage
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.fileTypes.SyntaxHighlighter
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingColors.kt b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingColors.kt
similarity index 97%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingColors.kt
rename to src/main/kotlin/com/github/wingidea/ide/highlighting/WingColors.kt
index e730362..369d67e 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingColors.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingColors.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide.highlighting
+package com.github.wingidea.ide.highlighting
 
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
 import com.intellij.openapi.editor.colors.TextAttributesKey.createTextAttributesKey
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingHighlightAnnotator.kt b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingHighlightAnnotator.kt
similarity index 87%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingHighlightAnnotator.kt
rename to src/main/kotlin/com/github/wingidea/ide/highlighting/WingHighlightAnnotator.kt
index d404f60..6868eee 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingHighlightAnnotator.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingHighlightAnnotator.kt
@@ -1,18 +1,17 @@
-package com.github.olivernybroe.wingidea.ide.highlighting
+package com.github.wingidea.ide.highlighting
 
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.lang.annotation.Annotator
 import com.intellij.psi.PsiElement
 import com.intellij.psi.util.elementType
-import com.github.olivernybroe.wingidea.lang.psi.*
-import com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*
-import com.intellij.codeInspection.util.InspectionMessage
+import com.github.wingidea.lang.psi.*
+import com.github.wingidea.lang.psi.WingElementTypes.*
 import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.openapi.editor.colors.TextAttributesKey
 
 /**
  * Annotates with PSI aware syntax highlighting.
- * For basic syntax highlighting see [WingSyntaxHighlighter].
+ * For basic syntax highlighting see [com.github.wingidea.ide.highlighting.WingSyntaxHighlighter].
  */
 class WingHighlightAnnotator : Annotator {
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingSyntaxHighlighter.kt b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingSyntaxHighlighter.kt
similarity index 85%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingSyntaxHighlighter.kt
rename to src/main/kotlin/com/github/wingidea/ide/highlighting/WingSyntaxHighlighter.kt
index e7cd984..ca2c792 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingSyntaxHighlighter.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingSyntaxHighlighter.kt
@@ -1,11 +1,11 @@
-package com.github.olivernybroe.wingidea.ide.highlighting
+package com.github.wingidea.ide.highlighting
 
-import com.github.olivernybroe.wingidea.lang.lexer.WingLexer
-import com.github.olivernybroe.wingidea.lang.psi.*
+import com.github.wingidea.lang.lexer.WingLexer
+import com.github.wingidea.lang.psi.*
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase
 import com.intellij.psi.tree.IElementType
-import com.github.olivernybroe.wingidea.lang.psi.WingElementTypes
+import com.github.wingidea.lang.psi.WingElementTypes
 
 /**
  * Defines the syntax highlighting for the Wing language.
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingSyntaxHighlighterFactory.kt b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingSyntaxHighlighterFactory.kt
similarity index 89%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingSyntaxHighlighterFactory.kt
rename to src/main/kotlin/com/github/wingidea/ide/highlighting/WingSyntaxHighlighterFactory.kt
index f47306d..7ad9ef6 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/highlighting/WingSyntaxHighlighterFactory.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/highlighting/WingSyntaxHighlighterFactory.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide.highlighting
+package com.github.wingidea.ide.highlighting
 
 import com.intellij.openapi.fileTypes.SyntaxHighlighter
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/lsp/WingLspServerSupportProvider.kt b/src/main/kotlin/com/github/wingidea/ide/lsp/WingLspServerSupportProvider.kt
similarity index 89%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/lsp/WingLspServerSupportProvider.kt
rename to src/main/kotlin/com/github/wingidea/ide/lsp/WingLspServerSupportProvider.kt
index 5b20bb7..4ecb5b8 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/lsp/WingLspServerSupportProvider.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/lsp/WingLspServerSupportProvider.kt
@@ -1,10 +1,9 @@
-package com.github.olivernybroe.wingidea.ide.lsp
+package com.github.wingidea.ide.lsp
 
-import com.github.olivernybroe.wingidea.WingIcons
-import com.github.olivernybroe.wingidea.ide.WingCommandLine
-import com.github.olivernybroe.wingidea.isWingFile
+import com.github.wingidea.WingIcons
+import com.github.wingidea.ide.WingCommandLine
+import com.github.wingidea.isWingFile
 import com.intellij.codeInsight.completion.CompletionParameters
-import com.intellij.codeInsight.completion.InsertHandler
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.openapi.editor.EditorModificationUtil
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/services/WingConsoleListener.kt b/src/main/kotlin/com/github/wingidea/ide/services/WingConsoleListener.kt
similarity index 87%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/services/WingConsoleListener.kt
rename to src/main/kotlin/com/github/wingidea/ide/services/WingConsoleListener.kt
index de36177..877c12f 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/services/WingConsoleListener.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/services/WingConsoleListener.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide.services
+package com.github.wingidea.ide.services
 
 import com.intellij.util.messages.Topic
 
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/services/WingConsoleManager.kt b/src/main/kotlin/com/github/wingidea/ide/services/WingConsoleManager.kt
similarity index 94%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/services/WingConsoleManager.kt
rename to src/main/kotlin/com/github/wingidea/ide/services/WingConsoleManager.kt
index f25c359..c68df0e 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/services/WingConsoleManager.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/services/WingConsoleManager.kt
@@ -1,7 +1,8 @@
-package com.github.olivernybroe.wingidea.ide.services
+@file:Suppress("PROVIDED_RUNTIME_TOO_LOW")
+package com.github.wingidea.ide.services
 
-import com.github.olivernybroe.wingidea.WingIcons
-import com.github.olivernybroe.wingidea.ide.WingCommandLine
+import com.github.wingidea.WingIcons
+import com.github.wingidea.ide.WingCommandLine
 import com.intellij.execution.impl.ExecutionManagerImpl
 import com.intellij.execution.process.KillableProcessHandler
 import com.intellij.execution.process.OSProcessHandler
@@ -42,7 +43,7 @@ class WingConsoleManager(val project: Project): Disposable {
     var path: String? = null
     var port: Int? = 3000
     var host: String? = "localhost"
-    var processHandler: OSProcessHandler? = null
+    private var processHandler: OSProcessHandler? = null
     private val json = Json {
         prettyPrint = true
         isLenient = true
@@ -158,7 +159,7 @@ class WingConsoleManager(val project: Project): Disposable {
     @Serializable
     data class SubscriptionQueryResult<T>(
         val type: SubscriptionQueryResultType,
-        @Contextual()
+        @Contextual
         val data: T? = null
         // ▼ {"id":200,"result":{"type":"data","data":{"data":{"message":"List (prefix=null).","status":"success","result":"[]"},"type":"resource","sourcePath":"root/Default/cloud.Bucket","sourceType":"wingsdk.cloud.Bucket","timestamp":"2023-08-04T12:21:48.773Z"}}}
     )
@@ -172,8 +173,12 @@ class WingConsoleManager(val project: Project): Disposable {
     @Serializable
     enum class InvalidateQueryResultData {
         @SerialName("app.error") ERROR,
-        @SerialName("app.state") STATE,
+        @SerialName("app.explorerTree") EXPLORER_TREE,
         @SerialName("app.logs") LOGS,
+        @SerialName("app.map") MAP,
+        @SerialName("app.nodeMetadata") NODE_METADATA,
+        @SerialName("app.state") STATE,
+        @SerialName("test.list") TEST_LIST,
     }
 
     @Serializable
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/servicesWindow/AddWingConnectionAction.kt b/src/main/kotlin/com/github/wingidea/ide/servicesWindow/AddWingConnectionAction.kt
similarity index 89%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/servicesWindow/AddWingConnectionAction.kt
rename to src/main/kotlin/com/github/wingidea/ide/servicesWindow/AddWingConnectionAction.kt
index 1089bbe..a128ebf 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/servicesWindow/AddWingConnectionAction.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/servicesWindow/AddWingConnectionAction.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.ide.servicesWindow
+package com.github.wingidea.ide.servicesWindow
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.DumbAwareAction
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/servicesWindow/WingServerType.kt b/src/main/kotlin/com/github/wingidea/ide/servicesWindow/WingServerType.kt
similarity index 93%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/servicesWindow/WingServerType.kt
rename to src/main/kotlin/com/github/wingidea/ide/servicesWindow/WingServerType.kt
index a259e57..7cdfd68 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/servicesWindow/WingServerType.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/servicesWindow/WingServerType.kt
@@ -1,7 +1,7 @@
-package com.github.olivernybroe.wingidea.ide.servicesWindow
+package com.github.wingidea.ide.servicesWindow
 
-import com.github.olivernybroe.wingidea.WingIcons
-import com.github.olivernybroe.wingidea.ide.WingCommandLine
+import com.github.wingidea.WingIcons
+import com.github.wingidea.ide.WingCommandLine
 import com.intellij.execution.process.OSProcessHandler
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.process.ProcessListener
@@ -71,7 +71,7 @@ class WingServerType(val project: Project) : ServerType<WingConfiguration>("wing
     }
 }
 
-class WingDeploymentConfigurator(): DeploymentConfigurator<WingDeploymentConfiguration, WingConfiguration>() {
+class WingDeploymentConfigurator: DeploymentConfigurator<WingDeploymentConfiguration, WingConfiguration>() {
     override fun getAvailableDeploymentSources(): MutableList<DeploymentSource> {
         return mutableListOf()
     }
@@ -102,6 +102,4 @@ class WingDeploymentConfigurator(): DeploymentConfigurator<WingDeploymentConfigu
 class WingDeploymentConfiguration: DeploymentConfigurationBase<WingDeploymentConfiguration>()
 
 
-class WingConfiguration(val project: Project) : ServerConfigurationBase<WingConfiguration>() {
-
-}
+class WingConfiguration(val project: Project) : ServerConfigurationBase<WingConfiguration>()
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/toolWindow/WingConsoleExplorerToolWindowFactory.kt b/src/main/kotlin/com/github/wingidea/ide/toolWindow/WingConsoleExplorerToolWindowFactory.kt
similarity index 95%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/toolWindow/WingConsoleExplorerToolWindowFactory.kt
rename to src/main/kotlin/com/github/wingidea/ide/toolWindow/WingConsoleExplorerToolWindowFactory.kt
index 9a6cb74..761f32c 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/toolWindow/WingConsoleExplorerToolWindowFactory.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/toolWindow/WingConsoleExplorerToolWindowFactory.kt
@@ -1,11 +1,11 @@
-package com.github.olivernybroe.wingidea.ide.toolWindow
+package com.github.wingidea.ide.toolWindow
 
-import com.github.olivernybroe.wingidea.ide.services.WingConsoleListener
+import com.github.wingidea.ide.services.WingConsoleListener
+import com.github.wingidea.ide.services.WingConsoleManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.content.ContentFactory
-import com.github.olivernybroe.wingidea.ide.services.WingConsoleManager
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/toolWindow/WingConsoleMapToolWindowFactory.kt b/src/main/kotlin/com/github/wingidea/ide/toolWindow/WingConsoleMapToolWindowFactory.kt
similarity index 93%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/ide/toolWindow/WingConsoleMapToolWindowFactory.kt
rename to src/main/kotlin/com/github/wingidea/ide/toolWindow/WingConsoleMapToolWindowFactory.kt
index 0408aa1..9e8550a 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/ide/toolWindow/WingConsoleMapToolWindowFactory.kt
+++ b/src/main/kotlin/com/github/wingidea/ide/toolWindow/WingConsoleMapToolWindowFactory.kt
@@ -1,11 +1,11 @@
-package com.github.olivernybroe.wingidea.ide.toolWindow
+package com.github.wingidea.ide.toolWindow
 
-import com.github.olivernybroe.wingidea.ide.services.WingConsoleListener
+import com.github.wingidea.ide.services.WingConsoleListener
+import com.github.wingidea.ide.services.WingConsoleManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.content.ContentFactory
-import com.github.olivernybroe.wingidea.ide.services.WingConsoleManager
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/WingFileType.kt b/src/main/kotlin/com/github/wingidea/lang/WingFileType.kt
similarity index 75%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/WingFileType.kt
rename to src/main/kotlin/com/github/wingidea/lang/WingFileType.kt
index d1b4700..4e3a5cf 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/WingFileType.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/WingFileType.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.lang
+package com.github.wingidea.lang
 
-import com.github.olivernybroe.wingidea.WingIcons
+import com.github.wingidea.WingIcons
 import com.intellij.openapi.fileTypes.LanguageFileType
 
 object WingFileType: LanguageFileType(WingLanguage) {
diff --git a/src/main/kotlin/com/github/wingidea/lang/WingLanguage.kt b/src/main/kotlin/com/github/wingidea/lang/WingLanguage.kt
new file mode 100644
index 0000000..398c160
--- /dev/null
+++ b/src/main/kotlin/com/github/wingidea/lang/WingLanguage.kt
@@ -0,0 +1,7 @@
+package com.github.wingidea.lang
+
+import com.intellij.lang.Language
+
+object WingLanguage: Language("Wing") {
+    private fun readResolve(): Any = WingLanguage
+}
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingLexer.kt b/src/main/kotlin/com/github/wingidea/lang/lexer/WingLexer.kt
similarity index 64%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingLexer.kt
rename to src/main/kotlin/com/github/wingidea/lang/lexer/WingLexer.kt
index 5c5382a..3f2f536 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingLexer.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/lexer/WingLexer.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.lang.lexer
+package com.github.wingidea.lang.lexer
 
-import com.github.olivernybroe.wingidea.lang.parser._WingLexer
+import com.github.wingidea.lang.parser._WingLexer
 import com.intellij.lexer.FlexAdapter
 
 /**
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/parser/WingParserDefinition.kt b/src/main/kotlin/com/github/wingidea/lang/parser/WingParserDefinition.kt
similarity index 86%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/parser/WingParserDefinition.kt
rename to src/main/kotlin/com/github/wingidea/lang/parser/WingParserDefinition.kt
index dc91450..62db7e1 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/parser/WingParserDefinition.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/parser/WingParserDefinition.kt
@@ -1,7 +1,7 @@
-package com.github.olivernybroe.wingidea.lang.parser
+package com.github.wingidea.lang.parser
 
-import com.github.olivernybroe.wingidea.lang.lexer.WingLexer
-import com.github.olivernybroe.wingidea.lang.psi.*
+import com.github.wingidea.lang.lexer.WingLexer
+import com.github.wingidea.lang.psi.*
 import com.intellij.lang.ASTNode
 import com.intellij.lang.ParserDefinition
 import com.intellij.lang.PsiParser
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/parser/WingParserUtil.kt b/src/main/kotlin/com/github/wingidea/lang/parser/WingParserUtil.kt
similarity index 89%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/parser/WingParserUtil.kt
rename to src/main/kotlin/com/github/wingidea/lang/parser/WingParserUtil.kt
index 2f972f8..bcbef35 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/parser/WingParserUtil.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/parser/WingParserUtil.kt
@@ -1,7 +1,7 @@
-package com.github.olivernybroe.wingidea.lang.parser
+package com.github.wingidea.lang.parser
 
-import com.github.olivernybroe.wingidea.WING_BUNDLE
-import com.github.olivernybroe.wingidea.WingBundle
+import com.github.wingidea.WING_BUNDLE
+import com.github.wingidea.WingBundle
 import com.intellij.lang.PsiBuilder
 import com.intellij.lang.PsiBuilderUtil
 import com.intellij.lang.parser.GeneratedParserUtilBase
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingElement.kt b/src/main/kotlin/com/github/wingidea/lang/psi/WingElement.kt
similarity index 71%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingElement.kt
rename to src/main/kotlin/com/github/wingidea/lang/psi/WingElement.kt
index 70d10b6..82d45b8 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingElement.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/psi/WingElement.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.lang.psi
+package com.github.wingidea.lang.psi
 
 import com.intellij.psi.PsiElement
 
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingElementType.kt b/src/main/kotlin/com/github/wingidea/lang/psi/WingElementType.kt
similarity index 62%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingElementType.kt
rename to src/main/kotlin/com/github/wingidea/lang/psi/WingElementType.kt
index 85de798..0a77384 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingElementType.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/psi/WingElementType.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.lang.psi
+package com.github.wingidea.lang.psi
 
-import com.github.olivernybroe.wingidea.lang.WingLanguage
+import com.github.wingidea.lang.WingLanguage
 import com.intellij.psi.tree.IElementType
 
 /**
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingFile.kt b/src/main/kotlin/com/github/wingidea/lang/psi/WingFile.kt
similarity index 66%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingFile.kt
rename to src/main/kotlin/com/github/wingidea/lang/psi/WingFile.kt
index 0906ae8..34a5c9c 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingFile.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/psi/WingFile.kt
@@ -1,7 +1,7 @@
-package com.github.olivernybroe.wingidea.lang.psi
+package com.github.wingidea.lang.psi
 
-import com.github.olivernybroe.wingidea.lang.WingFileType
-import com.github.olivernybroe.wingidea.lang.WingLanguage
+import com.github.wingidea.lang.WingFileType
+import com.github.wingidea.lang.WingLanguage
 import com.intellij.extapi.psi.PsiFileBase
 import com.intellij.openapi.fileTypes.FileType
 import com.intellij.psi.FileViewProvider
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingFileElementType.kt b/src/main/kotlin/com/github/wingidea/lang/psi/WingFileElementType.kt
similarity index 52%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingFileElementType.kt
rename to src/main/kotlin/com/github/wingidea/lang/psi/WingFileElementType.kt
index 35bb8de..b958eed 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingFileElementType.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/psi/WingFileElementType.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.lang.psi
+package com.github.wingidea.lang.psi
 
-import com.github.olivernybroe.wingidea.lang.WingLanguage
+import com.github.wingidea.lang.WingLanguage
 import com.intellij.psi.tree.IFileElementType
 
 object WingFileElementType : IFileElementType("WING_FILE", WingLanguage)
\ No newline at end of file
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingTokenType.kt b/src/main/kotlin/com/github/wingidea/lang/psi/WingTokenType.kt
similarity index 80%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingTokenType.kt
rename to src/main/kotlin/com/github/wingidea/lang/psi/WingTokenType.kt
index b686b3d..756e130 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/WingTokenType.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/psi/WingTokenType.kt
@@ -1,7 +1,7 @@
-package com.github.olivernybroe.wingidea.lang.psi
+package com.github.wingidea.lang.psi
 
-import com.github.olivernybroe.wingidea.lang.WingLanguage
-import com.github.olivernybroe.wingidea.lang.psi.WingElementTypes.*
+import com.github.wingidea.lang.WingLanguage
+import com.github.wingidea.lang.psi.WingElementTypes.*
 import com.intellij.psi.tree.IElementType
 import com.intellij.psi.tree.TokenSet.create
 
diff --git a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/impl/WingElementImpl.kt b/src/main/kotlin/com/github/wingidea/lang/psi/impl/WingElementImpl.kt
similarity index 65%
rename from src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/impl/WingElementImpl.kt
rename to src/main/kotlin/com/github/wingidea/lang/psi/impl/WingElementImpl.kt
index 8d378b0..f81b948 100644
--- a/src/main/kotlin/com/github/olivernybroe/wingidea/lang/psi/impl/WingElementImpl.kt
+++ b/src/main/kotlin/com/github/wingidea/lang/psi/impl/WingElementImpl.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.lang.psi.impl
+package com.github.wingidea.lang.psi.impl
 
-import com.github.olivernybroe.wingidea.lang.psi.WingElement
+import com.github.wingidea.lang.psi.WingElement
 import com.intellij.extapi.psi.ASTWrapperPsiElement
 import com.intellij.lang.ASTNode
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 5a599fd..422ca5b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -2,7 +2,7 @@
 <idea-plugin require-restart="false">
     <id>com.github.olivernybroe.wingidea</id>
     <name>Wing</name>
-    <vendor>Oliver Nybroe</vendor>
+    <vendor>Szasza Palmer</vendor>
 
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.modules.ultimate</depends>
@@ -11,50 +11,50 @@
     <resource-bundle>messages.WingBundle</resource-bundle>
 
     <extensions defaultExtensionNs="com.intellij">
-        <toolWindow factoryClass="com.github.olivernybroe.wingidea.ide.toolWindow.WingConsoleMapToolWindowFactory" id="Wing Console Map"/>
-        <toolWindow factoryClass="com.github.olivernybroe.wingidea.ide.toolWindow.WingConsoleExplorerToolWindowFactory" id="Wing Console Explorer"/>
+        <toolWindow factoryClass="com.github.wingidea.ide.toolWindow.WingConsoleMapToolWindowFactory" id="Wing Console Map"/>
+        <toolWindow factoryClass="com.github.wingidea.ide.toolWindow.WingConsoleExplorerToolWindowFactory" id="Wing Console Explorer"/>
         <!--suppress PluginXmlValidity -->
         <platform.lsp.serverSupportProvider
-                implementation="com.github.olivernybroe.wingidea.ide.lsp.WingLspServerSupportProvider"/>
+                implementation="com.github.wingidea.ide.lsp.WingLspServerSupportProvider"/>
         <fileType name="Wing"
-                  implementationClass="com.github.olivernybroe.wingidea.lang.WingFileType"
+                  implementationClass="com.github.wingidea.lang.WingFileType"
                   fieldName="INSTANCE"
                   language="Wing"
                   extensions="w"/>
         <lang.parserDefinition
                 language="Wing"
-                implementationClass="com.github.olivernybroe.wingidea.lang.parser.WingParserDefinition"
+                implementationClass="com.github.wingidea.lang.parser.WingParserDefinition"
         />
         <lang.syntaxHighlighterFactory language="Wing"
-                                       implementationClass="com.github.olivernybroe.wingidea.ide.highlighting.WingSyntaxHighlighterFactory"/>
-        <colorSettingsPage implementation="com.github.olivernybroe.wingidea.ide.highlighting.WingColorSettingsPage"/>
+                                       implementationClass="com.github.wingidea.ide.highlighting.WingSyntaxHighlighterFactory"/>
+        <colorSettingsPage implementation="com.github.wingidea.ide.highlighting.WingColorSettingsPage"/>
         <annotator
                 language="Wing"
-                implementationClass="com.github.olivernybroe.wingidea.ide.highlighting.WingHighlightAnnotator"/>
+                implementationClass="com.github.wingidea.ide.highlighting.WingHighlightAnnotator"/>
         <lang.formatter
                 language="Wing"
-                implementationClass="com.github.olivernybroe.wingidea.ide.formatter.WingFormattingModelBuilder"/>
+                implementationClass="com.github.wingidea.ide.formatter.WingFormattingModelBuilder"/>
         <langCodeStyleSettingsProvider
-                implementation="com.github.olivernybroe.wingidea.ide.formatter.settings.WingLanguageCodeStyleSettingsProvider"/>
+                implementation="com.github.wingidea.ide.formatter.settings.WingLanguageCodeStyleSettingsProvider"/>
         <lang.braceMatcher language="Wing"
-                           implementationClass="com.github.olivernybroe.wingidea.ide.editor.WingBraceMatcher"/>
+                           implementationClass="com.github.wingidea.ide.editor.WingBraceMatcher"/>
         <lang.commenter language="Wing"
-                        implementationClass="com.github.olivernybroe.wingidea.ide.editor.WingCommenter"/>
+                        implementationClass="com.github.wingidea.ide.editor.WingCommenter"/>
         <lang.quoteHandler language="Wing"
-                           implementationClass="com.github.olivernybroe.wingidea.ide.editor.WingQuoteHandler"/>
+                           implementationClass="com.github.wingidea.ide.editor.WingQuoteHandler"/>
         <lang.foldingBuilder language="Wing"
-                             implementationClass="com.github.olivernybroe.wingidea.ide.folding.WingBlockFoldingBuilder"/>
+                             implementationClass="com.github.wingidea.ide.folding.WingBlockFoldingBuilder"/>
         <lang.foldingBuilder language="Wing"
-                             implementationClass="com.github.olivernybroe.wingidea.ide.folding.WingImportFoldingBuilder"/>
+                             implementationClass="com.github.wingidea.ide.folding.WingImportFoldingBuilder"/>
     </extensions>
 
     <projectListeners>
         <listener topic="com.intellij.openapi.fileEditor.FileEditorManagerListener"
-                  class="com.github.olivernybroe.wingidea.ide.WingFileChangedListener"/>
+                  class="com.github.wingidea.ide.WingFileChangedListener"/>
     </projectListeners>
 
     <actions>
-        <action id="Wing.AddWingConnection" class="com.github.olivernybroe.wingidea.ide.servicesWindow.AddWingConnectionAction" text="Wing Connection">
+        <action id="Wing.AddWingConnection" class="com.github.wingidea.ide.servicesWindow.AddWingConnectionAction" text="Wing Connection">
             <add-to-group group-id="ServiceView.AddService"/>
         </action>
     </actions>
diff --git a/src/test/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingLexerTest.kt b/src/test/kotlin/com/github/wingidea/lang/lexer/WingLexerTest.kt
similarity index 90%
rename from src/test/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingLexerTest.kt
rename to src/test/kotlin/com/github/wingidea/lang/lexer/WingLexerTest.kt
index b1d6f4f..f920776 100644
--- a/src/test/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingLexerTest.kt
+++ b/src/test/kotlin/com/github/wingidea/lang/lexer/WingLexerTest.kt
@@ -1,4 +1,4 @@
-package com.github.olivernybroe.wingidea.lang.lexer
+package com.github.wingidea.lang.lexer
 
 import com.intellij.lexer.Lexer
 import com.intellij.testFramework.LexerTestCase
diff --git a/src/test/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingStructParsingTest.kt b/src/test/kotlin/com/github/wingidea/lang/lexer/WingStructParsingTest.kt
similarity index 73%
rename from src/test/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingStructParsingTest.kt
rename to src/test/kotlin/com/github/wingidea/lang/lexer/WingStructParsingTest.kt
index 2994e3b..5f524c5 100644
--- a/src/test/kotlin/com/github/olivernybroe/wingidea/lang/lexer/WingStructParsingTest.kt
+++ b/src/test/kotlin/com/github/wingidea/lang/lexer/WingStructParsingTest.kt
@@ -1,6 +1,6 @@
-package com.github.olivernybroe.wingidea.lang.lexer
+package com.github.wingidea.lang.lexer
 
-import com.github.olivernybroe.wingidea.lang.parser.WingParserDefinition
+import com.github.wingidea.lang.parser.WingParserDefinition
 import com.intellij.testFramework.ParsingTestCase
 import org.junit.Ignore