diff --git a/.gitignore b/.gitignore
index 8ba799b..8be6661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@ build/
 out/
 gradle/
 gradlew
-gradle.bat
+gradlew.bat
 
diff --git a/src/main/java/org/intellij/lang/jflex/JFlexCommenter.java b/src/main/java/de/jflex/ide/idea/JFlexCommenter.java
similarity index 95%
rename from src/main/java/org/intellij/lang/jflex/JFlexCommenter.java
rename to src/main/java/de/jflex/ide/idea/JFlexCommenter.java
index 76ffadf..db738e9 100644
--- a/src/main/java/org/intellij/lang/jflex/JFlexCommenter.java
+++ b/src/main/java/de/jflex/ide/idea/JFlexCommenter.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex;
+package de.jflex.ide.idea;
 
 import com.intellij.lang.Commenter;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/intellij/lang/jflex/JFlexDocumentationProvider.java b/src/main/java/de/jflex/ide/idea/JFlexDocumentationProvider.java
similarity index 94%
rename from src/main/java/org/intellij/lang/jflex/JFlexDocumentationProvider.java
rename to src/main/java/de/jflex/ide/idea/JFlexDocumentationProvider.java
index a1d8dc4..f23dd36 100644
--- a/src/main/java/org/intellij/lang/jflex/JFlexDocumentationProvider.java
+++ b/src/main/java/de/jflex/ide/idea/JFlexDocumentationProvider.java
@@ -1,10 +1,10 @@
-package org.intellij.lang.jflex;
+package de.jflex.ide.idea;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.documentation.DocumentationProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
-import org.intellij.lang.jflex.psi.JFlexMacroDefinition;
+import de.jflex.ide.idea.psi.JFlexMacroDefinition;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
diff --git a/src/main/java/org/intellij/lang/jflex/JFlexElementType.java b/src/main/java/de/jflex/ide/idea/JFlexElementType.java
similarity index 96%
rename from src/main/java/org/intellij/lang/jflex/JFlexElementType.java
rename to src/main/java/de/jflex/ide/idea/JFlexElementType.java
index bd3ee7e..4254fdd 100644
--- a/src/main/java/org/intellij/lang/jflex/JFlexElementType.java
+++ b/src/main/java/de/jflex/ide/idea/JFlexElementType.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex;
+package de.jflex.ide.idea;
 
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
diff --git a/src/main/java/org/intellij/lang/jflex/JFlexElementTypes.java b/src/main/java/de/jflex/ide/idea/JFlexElementTypes.java
similarity index 99%
rename from src/main/java/org/intellij/lang/jflex/JFlexElementTypes.java
rename to src/main/java/de/jflex/ide/idea/JFlexElementTypes.java
index 3ec78eb..98e4ed2 100644
--- a/src/main/java/org/intellij/lang/jflex/JFlexElementTypes.java
+++ b/src/main/java/de/jflex/ide/idea/JFlexElementTypes.java
@@ -1,6 +1,5 @@
-package org.intellij.lang.jflex;
+package de.jflex.ide.idea;
 
-import com.intellij.lang.Language;
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.IFileElementType;
diff --git a/src/main/java/org/intellij/lang/jflex/JFlexFindUsagesProvider.java b/src/main/java/de/jflex/ide/idea/JFlexFindUsagesProvider.java
similarity index 88%
rename from src/main/java/org/intellij/lang/jflex/JFlexFindUsagesProvider.java
rename to src/main/java/de/jflex/ide/idea/JFlexFindUsagesProvider.java
index c84cb15..9657273 100644
--- a/src/main/java/org/intellij/lang/jflex/JFlexFindUsagesProvider.java
+++ b/src/main/java/de/jflex/ide/idea/JFlexFindUsagesProvider.java
@@ -1,13 +1,13 @@
-package org.intellij.lang.jflex;
+package de.jflex.ide.idea;
 
 import com.intellij.lang.cacheBuilder.DefaultWordsScanner;
 import com.intellij.lang.cacheBuilder.WordsScanner;
 import com.intellij.lang.findUsages.FindUsagesProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
-import org.intellij.lang.jflex.lexer.JFlexMergingLexer;
-import org.intellij.lang.jflex.psi.JFlexMacroDefinition;
-import org.intellij.lang.jflex.psi.JFlexStateDefinition;
+import de.jflex.ide.idea.lexer.JFlexMergingLexer;
+import de.jflex.ide.idea.psi.JFlexMacroDefinition;
+import de.jflex.ide.idea.psi.JFlexStateDefinition;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/org/intellij/lang/jflex/JFlexLanguage.java b/src/main/java/de/jflex/ide/idea/JFlexLanguage.java
similarity index 90%
rename from src/main/java/org/intellij/lang/jflex/JFlexLanguage.java
rename to src/main/java/de/jflex/ide/idea/JFlexLanguage.java
index 1b89ca3..0f7f139 100644
--- a/src/main/java/org/intellij/lang/jflex/JFlexLanguage.java
+++ b/src/main/java/de/jflex/ide/idea/JFlexLanguage.java
@@ -1,10 +1,10 @@
-package org.intellij.lang.jflex;
+package de.jflex.ide.idea;
 
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
-import org.intellij.lang.jflex.fileTypes.JFlexSyntaxHighlighter;
+import de.jflex.ide.idea.fileTypes.JFlexSyntaxHighlighter;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/intellij/lang/jflex/compiler/JFlex.java b/src/main/java/de/jflex/ide/idea/compiler/JFlex.java
similarity index 98%
rename from src/main/java/org/intellij/lang/jflex/compiler/JFlex.java
rename to src/main/java/de/jflex/ide/idea/compiler/JFlex.java
index 93b1c9e..9730c71 100644
--- a/src/main/java/org/intellij/lang/jflex/compiler/JFlex.java
+++ b/src/main/java/de/jflex/ide/idea/compiler/JFlex.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.compiler;
+package de.jflex.ide.idea.compiler;
 
 import com.intellij.execution.CantRunException;
 import com.intellij.execution.configurations.CommandLineBuilder;
@@ -14,9 +14,9 @@
 import com.intellij.openapi.util.io.StreamUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.intellij.lang.jflex.options.JFlexConfigurable;
-import org.intellij.lang.jflex.options.JFlexSettings;
-import org.intellij.lang.jflex.util.JFlexBundle;
+import de.jflex.ide.idea.options.JFlexConfigurable;
+import de.jflex.ide.idea.options.JFlexSettings;
+import de.jflex.ide.idea.util.JFlexBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/intellij/lang/jflex/compiler/JFlexCompilerFactory.java b/src/main/java/de/jflex/ide/idea/compiler/JFlexCompilerFactory.java
similarity index 84%
rename from src/main/java/org/intellij/lang/jflex/compiler/JFlexCompilerFactory.java
rename to src/main/java/de/jflex/ide/idea/compiler/JFlexCompilerFactory.java
index 6df9943..10ccfdb 100644
--- a/src/main/java/org/intellij/lang/jflex/compiler/JFlexCompilerFactory.java
+++ b/src/main/java/de/jflex/ide/idea/compiler/JFlexCompilerFactory.java
@@ -1,8 +1,8 @@
-package org.intellij.lang.jflex.compiler;
+package de.jflex.ide.idea.compiler;
 
 import com.intellij.openapi.compiler.*;
 import com.intellij.openapi.compiler.Compiler;
-import org.intellij.lang.jflex.fileTypes.JFlexFileType;
+import de.jflex.ide.idea.fileTypes.JFlexFileType;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/compiler/JFlexMessage.java b/src/main/java/de/jflex/ide/idea/compiler/JFlexMessage.java
similarity index 95%
rename from src/main/java/org/intellij/lang/jflex/compiler/JFlexMessage.java
rename to src/main/java/de/jflex/ide/idea/compiler/JFlexMessage.java
index 37c5320..d1d93b0 100644
--- a/src/main/java/org/intellij/lang/jflex/compiler/JFlexMessage.java
+++ b/src/main/java/de/jflex/ide/idea/compiler/JFlexMessage.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.compiler;
+package de.jflex.ide.idea.compiler;
 
 import java.text.MessageFormat;
 
diff --git a/src/main/java/org/intellij/lang/jflex/compiler/JFlexSourceGeneratingCompiler.java b/src/main/java/de/jflex/ide/idea/compiler/JFlexSourceGeneratingCompiler.java
similarity index 97%
rename from src/main/java/org/intellij/lang/jflex/compiler/JFlexSourceGeneratingCompiler.java
rename to src/main/java/de/jflex/ide/idea/compiler/JFlexSourceGeneratingCompiler.java
index 660768f..9d79dbf 100644
--- a/src/main/java/org/intellij/lang/jflex/compiler/JFlexSourceGeneratingCompiler.java
+++ b/src/main/java/de/jflex/ide/idea/compiler/JFlexSourceGeneratingCompiler.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.compiler;
+package de.jflex.ide.idea.compiler;
 
 import com.intellij.compiler.CompilerConfiguration;
 import com.intellij.compiler.impl.CompilerUtil;
@@ -7,7 +7,6 @@
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.compiler.*;
-import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
@@ -19,10 +18,10 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
-import org.intellij.lang.jflex.fileTypes.JFlexFileType;
-import org.intellij.lang.jflex.psi.JFlexElement;
-import org.intellij.lang.jflex.psi.JFlexPsiFile;
-import org.intellij.lang.jflex.util.JFlexBundle;
+import de.jflex.ide.idea.psi.JFlexPsiFile;
+import de.jflex.ide.idea.fileTypes.JFlexFileType;
+import de.jflex.ide.idea.psi.JFlexElement;
+import de.jflex.ide.idea.util.JFlexBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/intellij/lang/jflex/editor/JFlexHighlighterColors.java b/src/main/java/de/jflex/ide/idea/editor/JFlexHighlighterColors.java
similarity index 99%
rename from src/main/java/org/intellij/lang/jflex/editor/JFlexHighlighterColors.java
rename to src/main/java/de/jflex/ide/idea/editor/JFlexHighlighterColors.java
index daa2d3f..58ce18b 100644
--- a/src/main/java/org/intellij/lang/jflex/editor/JFlexHighlighterColors.java
+++ b/src/main/java/de/jflex/ide/idea/editor/JFlexHighlighterColors.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.editor;
+package de.jflex.ide.idea.editor;
 
 import com.intellij.openapi.editor.HighlighterColors;
 import com.intellij.openapi.editor.SyntaxHighlighterColors;
diff --git a/src/main/java/org/intellij/lang/jflex/editor/colors/JFlexColorPage.java b/src/main/java/de/jflex/ide/idea/editor/colors/JFlexColorPage.java
similarity index 94%
rename from src/main/java/org/intellij/lang/jflex/editor/colors/JFlexColorPage.java
rename to src/main/java/de/jflex/ide/idea/editor/colors/JFlexColorPage.java
index 63af329..642963b 100644
--- a/src/main/java/org/intellij/lang/jflex/editor/colors/JFlexColorPage.java
+++ b/src/main/java/de/jflex/ide/idea/editor/colors/JFlexColorPage.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.editor.colors;
+package de.jflex.ide.idea.editor.colors;
 
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
@@ -6,11 +6,10 @@
 import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
 import com.intellij.openapi.options.colors.ColorSettingsPage;
-import com.intellij.lang.LanguageParserDefinitions;
 import com.intellij.lang.Language;
-import org.intellij.lang.jflex.JFlexLanguage;
-import org.intellij.lang.jflex.editor.JFlexHighlighterColors;
-import org.intellij.lang.jflex.fileTypes.JFlexFileType;
+import de.jflex.ide.idea.JFlexLanguage;
+import de.jflex.ide.idea.editor.JFlexHighlighterColors;
+import de.jflex.ide.idea.fileTypes.JFlexFileType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/intellij/lang/jflex/fileTypes/JFlexFileType.java b/src/main/java/de/jflex/ide/idea/fileTypes/JFlexFileType.java
similarity index 88%
rename from src/main/java/org/intellij/lang/jflex/fileTypes/JFlexFileType.java
rename to src/main/java/de/jflex/ide/idea/fileTypes/JFlexFileType.java
index 7265633..e56d28d 100644
--- a/src/main/java/org/intellij/lang/jflex/fileTypes/JFlexFileType.java
+++ b/src/main/java/de/jflex/ide/idea/fileTypes/JFlexFileType.java
@@ -1,9 +1,9 @@
-package org.intellij.lang.jflex.fileTypes;
+package de.jflex.ide.idea.fileTypes;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.util.IconLoader;
-import org.intellij.lang.jflex.JFlexLanguage;
-import org.intellij.lang.jflex.util.JFlexBundle;
+import de.jflex.ide.idea.JFlexLanguage;
+import de.jflex.ide.idea.util.JFlexBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/intellij/lang/jflex/fileTypes/JFlexFileTypeFactory.java b/src/main/java/de/jflex/ide/idea/fileTypes/JFlexFileTypeFactory.java
similarity index 91%
rename from src/main/java/org/intellij/lang/jflex/fileTypes/JFlexFileTypeFactory.java
rename to src/main/java/de/jflex/ide/idea/fileTypes/JFlexFileTypeFactory.java
index 72f5127..399f7ca 100755
--- a/src/main/java/org/intellij/lang/jflex/fileTypes/JFlexFileTypeFactory.java
+++ b/src/main/java/de/jflex/ide/idea/fileTypes/JFlexFileTypeFactory.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.fileTypes;
+package de.jflex.ide.idea.fileTypes;
 
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
diff --git a/src/main/java/org/intellij/lang/jflex/fileTypes/JFlexSyntaxHighlighter.java b/src/main/java/de/jflex/ide/idea/fileTypes/JFlexSyntaxHighlighter.java
similarity index 90%
rename from src/main/java/org/intellij/lang/jflex/fileTypes/JFlexSyntaxHighlighter.java
rename to src/main/java/de/jflex/ide/idea/fileTypes/JFlexSyntaxHighlighter.java
index d806407..a0769cc 100644
--- a/src/main/java/org/intellij/lang/jflex/fileTypes/JFlexSyntaxHighlighter.java
+++ b/src/main/java/de/jflex/ide/idea/fileTypes/JFlexSyntaxHighlighter.java
@@ -1,15 +1,13 @@
-package org.intellij.lang.jflex.fileTypes;
+package de.jflex.ide.idea.fileTypes;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.tree.IElementType;
-import org.intellij.lang.jflex.JFlexElementType;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.editor.JFlexHighlighterColors;
-import org.intellij.lang.jflex.lexer.JFlexHighlighterLexer;
+import de.jflex.ide.idea.JFlexElementType;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.editor.JFlexHighlighterColors;
+import de.jflex.ide.idea.lexer.JFlexHighlighterLexer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
diff --git a/src/main/java/org/intellij/lang/jflex/injection/EmbeddedJavaLiteralTextEscaper.java b/src/main/java/de/jflex/ide/idea/injection/EmbeddedJavaLiteralTextEscaper.java
similarity index 91%
rename from src/main/java/org/intellij/lang/jflex/injection/EmbeddedJavaLiteralTextEscaper.java
rename to src/main/java/de/jflex/ide/idea/injection/EmbeddedJavaLiteralTextEscaper.java
index ee70d95..abed260 100644
--- a/src/main/java/org/intellij/lang/jflex/injection/EmbeddedJavaLiteralTextEscaper.java
+++ b/src/main/java/de/jflex/ide/idea/injection/EmbeddedJavaLiteralTextEscaper.java
@@ -1,8 +1,8 @@
-package org.intellij.lang.jflex.injection;
+package de.jflex.ide.idea.injection;
 
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.LiteralTextEscaper;
-import org.intellij.lang.jflex.psi.JFlexJavaCode;
+import de.jflex.ide.idea.psi.JFlexJavaCode;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/injection/JFlexJavaInjector.java b/src/main/java/de/jflex/ide/idea/injection/JFlexJavaInjector.java
similarity index 92%
rename from src/main/java/org/intellij/lang/jflex/injection/JFlexJavaInjector.java
rename to src/main/java/de/jflex/ide/idea/injection/JFlexJavaInjector.java
index 901a8ee..78a9b63 100644
--- a/src/main/java/org/intellij/lang/jflex/injection/JFlexJavaInjector.java
+++ b/src/main/java/de/jflex/ide/idea/injection/JFlexJavaInjector.java
@@ -1,14 +1,14 @@
-package org.intellij.lang.jflex.injection;
+package de.jflex.ide.idea.injection;
 
 import com.intellij.lang.StdLanguages;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.InjectedLanguagePlaces;
 import com.intellij.psi.LanguageInjector;
 import com.intellij.psi.PsiLanguageInjectionHost;
-import org.intellij.lang.jflex.options.JFlexSettings;
-import org.intellij.lang.jflex.psi.JFlexElement;
-import org.intellij.lang.jflex.psi.JFlexJavaCode;
-import org.intellij.lang.jflex.psi.JFlexPsiFile;
+import de.jflex.ide.idea.psi.JFlexElement;
+import de.jflex.ide.idea.psi.JFlexJavaCode;
+import de.jflex.ide.idea.psi.JFlexPsiFile;
+import de.jflex.ide.idea.options.JFlexSettings;
 import org.jetbrains.annotations.NotNull;
 
 public class JFlexJavaInjector implements LanguageInjector {
diff --git a/src/main/java/org/intellij/lang/jflex/lexer/JFlex.flex b/src/main/java/de/jflex/ide/idea/lexer/JFlex.flex
similarity index 99%
rename from src/main/java/org/intellij/lang/jflex/lexer/JFlex.flex
rename to src/main/java/de/jflex/ide/idea/lexer/JFlex.flex
index aca1269..42b3413 100644
--- a/src/main/java/org/intellij/lang/jflex/lexer/JFlex.flex
+++ b/src/main/java/de/jflex/ide/idea/lexer/JFlex.flex
@@ -2,7 +2,7 @@ package org.intellij.lang.jflex.lexer;
 
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
-import org.intellij.lang.jflex.JFlexElementTypes;
+import JFlexElementTypes;
 
 %%
 
diff --git a/src/main/java/org/intellij/lang/jflex/lexer/JFlexHighlighterLexer.java b/src/main/java/de/jflex/ide/idea/lexer/JFlexHighlighterLexer.java
similarity index 75%
rename from src/main/java/org/intellij/lang/jflex/lexer/JFlexHighlighterLexer.java
rename to src/main/java/de/jflex/ide/idea/lexer/JFlexHighlighterLexer.java
index 6a20ed6..9d3b0de 100644
--- a/src/main/java/org/intellij/lang/jflex/lexer/JFlexHighlighterLexer.java
+++ b/src/main/java/de/jflex/ide/idea/lexer/JFlexHighlighterLexer.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.lexer;
+package de.jflex.ide.idea.lexer;
 
 /**
  * Lexer adapter.
diff --git a/src/main/java/org/intellij/lang/jflex/lexer/JFlexMergingLexer.java b/src/main/java/de/jflex/ide/idea/lexer/JFlexMergingLexer.java
similarity index 84%
rename from src/main/java/org/intellij/lang/jflex/lexer/JFlexMergingLexer.java
rename to src/main/java/de/jflex/ide/idea/lexer/JFlexMergingLexer.java
index c2974b6..7780ff1 100644
--- a/src/main/java/org/intellij/lang/jflex/lexer/JFlexMergingLexer.java
+++ b/src/main/java/de/jflex/ide/idea/lexer/JFlexMergingLexer.java
@@ -1,9 +1,9 @@
-package org.intellij.lang.jflex.lexer;
+package de.jflex.ide.idea.lexer;
 
 import com.intellij.lexer.FlexAdapter;
 import com.intellij.lexer.MergingLexerAdapter;
 import com.intellij.psi.tree.TokenSet;
-import org.intellij.lang.jflex.JFlexElementTypes;
+import de.jflex.ide.idea.JFlexElementTypes;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/main/java/org/intellij/lang/jflex/lexer/JFlexParsingLexer.java b/src/main/java/de/jflex/ide/idea/lexer/JFlexParsingLexer.java
similarity index 74%
rename from src/main/java/org/intellij/lang/jflex/lexer/JFlexParsingLexer.java
rename to src/main/java/de/jflex/ide/idea/lexer/JFlexParsingLexer.java
index 4f4486d..9543b76 100644
--- a/src/main/java/org/intellij/lang/jflex/lexer/JFlexParsingLexer.java
+++ b/src/main/java/de/jflex/ide/idea/lexer/JFlexParsingLexer.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.lexer;
+package de.jflex.ide.idea.lexer;
 
 /**
  * Lexer adapter.
diff --git a/src/main/java/org/intellij/lang/jflex/lexer/_JFlexLexer.java b/src/main/java/de/jflex/ide/idea/lexer/_JFlexLexer.java
similarity index 99%
rename from src/main/java/org/intellij/lang/jflex/lexer/_JFlexLexer.java
rename to src/main/java/de/jflex/ide/idea/lexer/_JFlexLexer.java
index 00f3b0f..7b774a1 100644
--- a/src/main/java/org/intellij/lang/jflex/lexer/_JFlexLexer.java
+++ b/src/main/java/de/jflex/ide/idea/lexer/_JFlexLexer.java
@@ -1,10 +1,10 @@
 /* The following code was generated by JFlex 1.4.3 on 01.02.11 3:31 */
 
-package org.intellij.lang.jflex.lexer;
+package de.jflex.ide.idea.lexer;
 
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
-import org.intellij.lang.jflex.JFlexElementTypes;
+import de.jflex.ide.idea.JFlexElementTypes;
 
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/options/JFlexConfigurable.java b/src/main/java/de/jflex/ide/idea/options/JFlexConfigurable.java
similarity index 94%
rename from src/main/java/org/intellij/lang/jflex/options/JFlexConfigurable.java
rename to src/main/java/de/jflex/ide/idea/options/JFlexConfigurable.java
index 002906c..d5f988a 100644
--- a/src/main/java/org/intellij/lang/jflex/options/JFlexConfigurable.java
+++ b/src/main/java/de/jflex/ide/idea/options/JFlexConfigurable.java
@@ -1,10 +1,10 @@
-package org.intellij.lang.jflex.options;
+package de.jflex.ide.idea.options;
 
 import javax.swing.*;
 
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
-import org.intellij.lang.jflex.util.JFlexBundle;
+import de.jflex.ide.idea.util.JFlexBundle;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/intellij/lang/jflex/options/JFlexSettings.java b/src/main/java/de/jflex/ide/idea/options/JFlexSettings.java
similarity index 88%
rename from src/main/java/org/intellij/lang/jflex/options/JFlexSettings.java
rename to src/main/java/de/jflex/ide/idea/options/JFlexSettings.java
index 92092f9..1fb6e36 100644
--- a/src/main/java/org/intellij/lang/jflex/options/JFlexSettings.java
+++ b/src/main/java/de/jflex/ide/idea/options/JFlexSettings.java
@@ -1,12 +1,9 @@
-package org.intellij.lang.jflex.options;
+package de.jflex.ide.idea.options;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.components.*;
 import com.intellij.util.xmlb.XmlSerializerUtil;
-import org.intellij.lang.jflex.util.JFlexBundle;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 
diff --git a/src/main/java/org/intellij/lang/jflex/options/JFlexSettingsForm.form b/src/main/java/de/jflex/ide/idea/options/JFlexSettingsForm.form
similarity index 98%
rename from src/main/java/org/intellij/lang/jflex/options/JFlexSettingsForm.form
rename to src/main/java/de/jflex/ide/idea/options/JFlexSettingsForm.form
index 2cb1e0c..14e5388 100644
--- a/src/main/java/org/intellij/lang/jflex/options/JFlexSettingsForm.form
+++ b/src/main/java/de/jflex/ide/idea/options/JFlexSettingsForm.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.intellij.lang.jflex.options.JFlexSettingsForm">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.jflex.ide.idea.options.JFlexSettingsForm">
   <grid id="27dc6" binding="formComponent" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
diff --git a/src/main/java/org/intellij/lang/jflex/options/JFlexSettingsForm.java b/src/main/java/de/jflex/ide/idea/options/JFlexSettingsForm.java
similarity index 96%
rename from src/main/java/org/intellij/lang/jflex/options/JFlexSettingsForm.java
rename to src/main/java/de/jflex/ide/idea/options/JFlexSettingsForm.java
index 54383c2..ad78f4b 100644
--- a/src/main/java/org/intellij/lang/jflex/options/JFlexSettingsForm.java
+++ b/src/main/java/de/jflex/ide/idea/options/JFlexSettingsForm.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.options;
+package de.jflex.ide.idea.options;
 
 import javax.swing.*;
 import java.awt.*;
@@ -20,7 +20,7 @@
 import com.intellij.uiDesigner.core.GridConstraints;
 import com.intellij.uiDesigner.core.GridLayoutManager;
 import com.intellij.uiDesigner.core.Spacer;
-import org.intellij.lang.jflex.util.JFlexBundle;
+import de.jflex.ide.idea.util.JFlexBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -131,20 +131,24 @@ public boolean isModified(JFlexSettings state) {
         formComponent = new JPanel();
         formComponent.setLayout(new GridLayoutManager(5, 2, new Insets(0, 0, 0, 0), -1, -1));
         final JLabel label1 = new JLabel();
-        this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("path.to.jflex"));
+        this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle(
+            "de/jflex/ide/idea/util/JFlexBundle").getString("path.to.jflex"));
         formComponent.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final Spacer spacer1 = new Spacer();
         formComponent.add(spacer1, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
         formComponent.add(jFlexHomeTextField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label2 = new JLabel();
-        this.$$$loadLabelText$$$(label2, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("skeleton.file"));
+        this.$$$loadLabelText$$$(label2, ResourceBundle.getBundle(
+            "de/jflex/ide/idea/util/JFlexBundle").getString("skeleton.file"));
         formComponent.add(label2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         formComponent.add(skeletonPathTextField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         final JLabel label3 = new JLabel();
-        this.$$$loadLabelText$$$(label3, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("command.line.options"));
+        this.$$$loadLabelText$$$(label3, ResourceBundle.getBundle(
+            "de/jflex/ide/idea/util/JFlexBundle").getString("command.line.options"));
         formComponent.add(label3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         formComponent.add(commandLineOptionsTextField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
-        this.$$$loadButtonText$$$(enabledEmbedJavaCheckBox, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("enabled.embed.java.code.support"));
+        this.$$$loadButtonText$$$(enabledEmbedJavaCheckBox, ResourceBundle.getBundle(
+            "de/jflex/ide/idea/util/JFlexBundle").getString("enabled.embed.java.code.support"));
         formComponent.add(enabledEmbedJavaCheckBox, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
         label1.setLabelFor(jFlexHomeTextField);
         label2.setLabelFor(skeletonPathTextField);
diff --git a/src/main/java/org/intellij/lang/jflex/parser/JFlexParser.java b/src/main/java/de/jflex/ide/idea/parser/JFlexParser.java
similarity index 97%
rename from src/main/java/org/intellij/lang/jflex/parser/JFlexParser.java
rename to src/main/java/de/jflex/ide/idea/parser/JFlexParser.java
index 911526c..18d6b64 100644
--- a/src/main/java/org/intellij/lang/jflex/parser/JFlexParser.java
+++ b/src/main/java/de/jflex/ide/idea/parser/JFlexParser.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.parser;
+package de.jflex.ide.idea.parser;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.PsiBuilder;
@@ -6,8 +6,8 @@
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.tree.IElementType;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.util.JFlexBundle;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.util.JFlexBundle;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/parser/JFlexParserDefinition.java b/src/main/java/de/jflex/ide/idea/parser/JFlexParserDefinition.java
similarity index 78%
rename from src/main/java/org/intellij/lang/jflex/parser/JFlexParserDefinition.java
rename to src/main/java/de/jflex/ide/idea/parser/JFlexParserDefinition.java
index 8d74c2a..b800adb 100644
--- a/src/main/java/org/intellij/lang/jflex/parser/JFlexParserDefinition.java
+++ b/src/main/java/de/jflex/ide/idea/parser/JFlexParserDefinition.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.parser;
+package de.jflex.ide.idea.parser;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.LanguageUtil;
@@ -12,9 +12,21 @@
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.lexer.JFlexParsingLexer;
-import org.intellij.lang.jflex.parser.JFlexParser;
+import de.jflex.ide.idea.psi.impl.JFlexClassStatementImpl;
+import de.jflex.ide.idea.psi.impl.JFlexExpressionImpl;
+import de.jflex.ide.idea.psi.impl.JFlexImplementsStatementImpl;
+import de.jflex.ide.idea.psi.impl.JFlexJavaCodeImpl;
+import de.jflex.ide.idea.psi.impl.JFlexMacroDefinitionImpl;
+import de.jflex.ide.idea.psi.impl.JFlexMacroReferenceImpl;
+import de.jflex.ide.idea.psi.impl.JFlexPsiFileImpl;
+import de.jflex.ide.idea.psi.impl.JFlexRegexpImpl;
+import de.jflex.ide.idea.psi.impl.JFlexSectionImpl;
+import de.jflex.ide.idea.psi.impl.JFlexStateDefinitionImpl;
+import de.jflex.ide.idea.psi.impl.JFlexStateReferenceImpl;
+import de.jflex.ide.idea.psi.impl.JFlexStateStatementImpl;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.lexer.JFlexParsingLexer;
+import de.jflex.ide.idea.psi.impl.JFlexTypeStatementImpl;
 import org.intellij.lang.jflex.psi.impl.*;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexClassStatement.java b/src/main/java/de/jflex/ide/idea/psi/JFlexClassStatement.java
similarity index 80%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexClassStatement.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexClassStatement.java
index e6833f4..98b5fc2 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexClassStatement.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexClassStatement.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * The JFlex "%class _MyLexer" statement
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexElement.java b/src/main/java/de/jflex/ide/idea/psi/JFlexElement.java
similarity index 78%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexElement.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexElement.java
index 215c7f2..a932a6d 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexElement.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexElement.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import com.intellij.psi.PsiElement;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexElementVisitor.java b/src/main/java/de/jflex/ide/idea/psi/JFlexElementVisitor.java
similarity index 90%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexElementVisitor.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexElementVisitor.java
index 2d1f4ae..e460b2b 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexElementVisitor.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexElementVisitor.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReferenceExpression;
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexExpression.java b/src/main/java/de/jflex/ide/idea/psi/JFlexExpression.java
similarity index 75%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexExpression.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexExpression.java
index 13799e8..d42ca7b 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexExpression.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexExpression.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * JFlex expression.
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexImplementsStatement.java b/src/main/java/de/jflex/ide/idea/psi/JFlexImplementsStatement.java
similarity index 87%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexImplementsStatement.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexImplementsStatement.java
index 3c13738..088e572 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexImplementsStatement.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexImplementsStatement.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexJavaCode.java b/src/main/java/de/jflex/ide/idea/psi/JFlexJavaCode.java
similarity index 87%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexJavaCode.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexJavaCode.java
index ff3ce52..c65c641 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexJavaCode.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexJavaCode.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import com.intellij.psi.PsiLanguageInjectionHost;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexMacroDefinition.java b/src/main/java/de/jflex/ide/idea/psi/JFlexMacroDefinition.java
similarity index 88%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexMacroDefinition.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexMacroDefinition.java
index 3fed659..37947f9 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexMacroDefinition.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexMacroDefinition.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNamedElement;
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexMacroReference.java b/src/main/java/de/jflex/ide/idea/psi/JFlexMacroReference.java
similarity index 84%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexMacroReference.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexMacroReference.java
index 2e7df43..b666e6b 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexMacroReference.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexMacroReference.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import com.intellij.psi.PsiReference;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexOptionStatement.java b/src/main/java/de/jflex/ide/idea/psi/JFlexOptionStatement.java
similarity index 89%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexOptionStatement.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexOptionStatement.java
index 0a9236c..5e61ada 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexOptionStatement.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexOptionStatement.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexPsiFile.java b/src/main/java/de/jflex/ide/idea/psi/JFlexPsiFile.java
similarity index 92%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexPsiFile.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexPsiFile.java
index d0e7614..726c201 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexPsiFile.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexPsiFile.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexRegexp.java b/src/main/java/de/jflex/ide/idea/psi/JFlexRegexp.java
similarity index 79%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexRegexp.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexRegexp.java
index a59d236..aa94e56 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexRegexp.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexRegexp.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexSection.java b/src/main/java/de/jflex/ide/idea/psi/JFlexSection.java
similarity index 89%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexSection.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexSection.java
index 3d214d8..0f3ecf0 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexSection.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexSection.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexStateDefinition.java b/src/main/java/de/jflex/ide/idea/psi/JFlexStateDefinition.java
similarity index 85%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexStateDefinition.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexStateDefinition.java
index ed54d34..99c902d 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexStateDefinition.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexStateDefinition.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import com.intellij.psi.PsiNamedElement;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexStateReference.java b/src/main/java/de/jflex/ide/idea/psi/JFlexStateReference.java
similarity index 84%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexStateReference.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexStateReference.java
index ec2532b..d673ac5 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexStateReference.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexStateReference.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 import com.intellij.psi.PsiReference;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexStateStatement.java b/src/main/java/de/jflex/ide/idea/psi/JFlexStateStatement.java
similarity index 85%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexStateStatement.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexStateStatement.java
index a54cb64..8cdd4a1 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexStateStatement.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexStateStatement.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexStatement.java b/src/main/java/de/jflex/ide/idea/psi/JFlexStatement.java
similarity index 75%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexStatement.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexStatement.java
index be1a00c..78ebe42 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexStatement.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexStatement.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * JFlex statement
diff --git a/src/main/java/org/intellij/lang/jflex/psi/JFlexTypeStatement.java b/src/main/java/de/jflex/ide/idea/psi/JFlexTypeStatement.java
similarity index 81%
rename from src/main/java/org/intellij/lang/jflex/psi/JFlexTypeStatement.java
rename to src/main/java/de/jflex/ide/idea/psi/JFlexTypeStatement.java
index 54f244d..dd15a7f 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/JFlexTypeStatement.java
+++ b/src/main/java/de/jflex/ide/idea/psi/JFlexTypeStatement.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi;
+package de.jflex.ide.idea.psi;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexClassStatementImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexClassStatementImpl.java
similarity index 77%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexClassStatementImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexClassStatementImpl.java
index fc79ba4..6058df9 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexClassStatementImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexClassStatementImpl.java
@@ -1,7 +1,7 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.psi.JFlexClassStatement;
+import de.jflex.ide.idea.psi.JFlexClassStatement;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -9,7 +9,8 @@
  *
  * @author Alexey Efimov
  */
-public class JFlexClassStatementImpl extends JFlexOptionStatementBase implements JFlexClassStatement {
+public class JFlexClassStatementImpl extends JFlexOptionStatementBase implements
+    JFlexClassStatement {
 
     public JFlexClassStatementImpl(@NotNull ASTNode node) {
         super(node);
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexElementImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexElementImpl.java
similarity index 86%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexElementImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexElementImpl.java
index 839dcde..d4ef846 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexElementImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexElementImpl.java
@@ -1,10 +1,10 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
-import org.intellij.lang.jflex.JFlexLanguage;
-import org.intellij.lang.jflex.psi.JFlexElement;
+import de.jflex.ide.idea.JFlexLanguage;
+import de.jflex.ide.idea.psi.JFlexElement;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexExpressionImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexExpressionImpl.java
similarity index 77%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexExpressionImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexExpressionImpl.java
index 79a7116..0b3f5a0 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexExpressionImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexExpressionImpl.java
@@ -1,7 +1,7 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.psi.JFlexExpression;
+import de.jflex.ide.idea.psi.JFlexExpression;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexImplementsStatementImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexImplementsStatementImpl.java
similarity index 73%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexImplementsStatementImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexImplementsStatementImpl.java
index 99b1c34..29619d3 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexImplementsStatementImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexImplementsStatementImpl.java
@@ -1,9 +1,9 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.psi.JFlexExpression;
-import org.intellij.lang.jflex.psi.JFlexImplementsStatement;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.psi.JFlexExpression;
+import de.jflex.ide.idea.psi.JFlexImplementsStatement;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -12,7 +12,8 @@
  * Date: 18.03.2008
  * Time: 23:53:42
  */
-public class JFlexImplementsStatementImpl extends JFlexElementImpl implements JFlexImplementsStatement {
+public class JFlexImplementsStatementImpl extends JFlexElementImpl implements
+    JFlexImplementsStatement {
 
     public JFlexImplementsStatementImpl(@NotNull ASTNode node) {
         super(node);
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexJavaCodeImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexJavaCodeImpl.java
similarity index 88%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexJavaCodeImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexJavaCodeImpl.java
index f7b0552..46cd0a8 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexJavaCodeImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexJavaCodeImpl.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.injection.InjectedLanguageManager;
@@ -8,9 +8,9 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLanguageInjectionHost;
 import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.injection.EmbeddedJavaLiteralTextEscaper;
-import org.intellij.lang.jflex.psi.JFlexJavaCode;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.injection.EmbeddedJavaLiteralTextEscaper;
+import de.jflex.ide.idea.psi.JFlexJavaCode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexMacroDefinitionImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexMacroDefinitionImpl.java
similarity index 87%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexMacroDefinitionImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexMacroDefinitionImpl.java
index 16ff755..98a1f04 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexMacroDefinitionImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexMacroDefinitionImpl.java
@@ -1,10 +1,10 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.psi.JFlexMacroDefinition;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.psi.JFlexMacroDefinition;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexMacroReferenceImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexMacroReferenceImpl.java
similarity index 89%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexMacroReferenceImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexMacroReferenceImpl.java
index f23bbbb..ea35fd0 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexMacroReferenceImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexMacroReferenceImpl.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
@@ -8,10 +8,10 @@
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.Query;
-import org.intellij.lang.jflex.psi.JFlexMacroDefinition;
-import org.intellij.lang.jflex.psi.JFlexMacroReference;
-import org.intellij.lang.jflex.psi.JFlexPsiFile;
-import org.intellij.lang.jflex.validation.JFlexAnnotatingVisitor;
+import de.jflex.ide.idea.psi.JFlexMacroDefinition;
+import de.jflex.ide.idea.psi.JFlexMacroReference;
+import de.jflex.ide.idea.psi.JFlexPsiFile;
+import de.jflex.ide.idea.validation.JFlexAnnotatingVisitor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexOptionStatementBase.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexOptionStatementBase.java
similarity index 70%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexOptionStatementBase.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexOptionStatementBase.java
index d15e676..b8a5718 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexOptionStatementBase.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexOptionStatementBase.java
@@ -1,9 +1,9 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.psi.JFlexExpression;
-import org.intellij.lang.jflex.psi.JFlexOptionStatement;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.psi.JFlexExpression;
+import de.jflex.ide.idea.psi.JFlexOptionStatement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -13,7 +13,8 @@
  * Date: 17.03.2008
  * Time: 23:21:47
  */
-public abstract class JFlexOptionStatementBase extends JFlexElementImpl implements JFlexOptionStatement {
+public abstract class JFlexOptionStatementBase extends JFlexElementImpl implements
+    JFlexOptionStatement {
 
     public JFlexOptionStatementBase(@NotNull ASTNode node) {
         super(node);
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexPsiFileImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexPsiFileImpl.java
similarity index 83%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexPsiFileImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexPsiFileImpl.java
index 98ca788..b19ae2f 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexPsiFileImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexPsiFileImpl.java
@@ -1,13 +1,22 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.extapi.psi.PsiFileBase;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.tree.TokenSet;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.JFlexLanguage;
-import org.intellij.lang.jflex.fileTypes.JFlexFileType;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.psi.JFlexClassStatement;
+import de.jflex.ide.idea.psi.JFlexElement;
+import de.jflex.ide.idea.psi.JFlexExpression;
+import de.jflex.ide.idea.psi.JFlexImplementsStatement;
+import de.jflex.ide.idea.psi.JFlexJavaCode;
+import de.jflex.ide.idea.psi.JFlexMacroDefinition;
+import de.jflex.ide.idea.psi.JFlexPsiFile;
+import de.jflex.ide.idea.psi.JFlexStateStatement;
+import de.jflex.ide.idea.psi.JFlexTypeStatement;
+import de.jflex.ide.idea.JFlexLanguage;
+import de.jflex.ide.idea.fileTypes.JFlexFileType;
 import org.intellij.lang.jflex.psi.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexRegexpImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexRegexpImpl.java
similarity index 78%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexRegexpImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexRegexpImpl.java
index 68eeb3a..fe07b34 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexRegexpImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexRegexpImpl.java
@@ -1,7 +1,7 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.psi.JFlexRegexp;
+import de.jflex.ide.idea.psi.JFlexRegexp;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexSectionImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexSectionImpl.java
similarity index 78%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexSectionImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexSectionImpl.java
index c0b2ec5..cf14bae 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexSectionImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexSectionImpl.java
@@ -1,7 +1,7 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.psi.JFlexSection;
+import de.jflex.ide.idea.psi.JFlexSection;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateDefinitionImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateDefinitionImpl.java
similarity index 87%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateDefinitionImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateDefinitionImpl.java
index c8553bc..325d0a9 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateDefinitionImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateDefinitionImpl.java
@@ -1,9 +1,9 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
-import org.intellij.lang.jflex.psi.JFlexStateDefinition;
+import de.jflex.ide.idea.psi.JFlexStateDefinition;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateReferenceImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateReferenceImpl.java
similarity index 89%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateReferenceImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateReferenceImpl.java
index 6f482ac..b5b327c 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateReferenceImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateReferenceImpl.java
@@ -1,14 +1,14 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.IncorrectOperationException;
-import org.intellij.lang.jflex.psi.JFlexPsiFile;
-import org.intellij.lang.jflex.psi.JFlexStateDefinition;
-import org.intellij.lang.jflex.psi.JFlexStateReference;
-import org.intellij.lang.jflex.psi.JFlexStateStatement;
+import de.jflex.ide.idea.psi.JFlexPsiFile;
+import de.jflex.ide.idea.psi.JFlexStateDefinition;
+import de.jflex.ide.idea.psi.JFlexStateStatement;
+import de.jflex.ide.idea.psi.JFlexStateReference;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateStatementImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateStatementImpl.java
similarity index 80%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateStatementImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateStatementImpl.java
index d69b939..bc583f1 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStateStatementImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStateStatementImpl.java
@@ -1,10 +1,10 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.tree.TokenSet;
-import org.intellij.lang.jflex.JFlexElementTypes;
-import org.intellij.lang.jflex.psi.JFlexStateDefinition;
-import org.intellij.lang.jflex.psi.JFlexStateStatement;
+import de.jflex.ide.idea.JFlexElementTypes;
+import de.jflex.ide.idea.psi.JFlexStateDefinition;
+import de.jflex.ide.idea.psi.JFlexStateStatement;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStatementImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStatementImpl.java
similarity index 77%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStatementImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexStatementImpl.java
index 4bd93d0..029bfd3 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexStatementImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexStatementImpl.java
@@ -1,7 +1,7 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.psi.JFlexStatement;
+import de.jflex.ide.idea.psi.JFlexStatement;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexTypeStatementImpl.java b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexTypeStatementImpl.java
similarity index 78%
rename from src/main/java/org/intellij/lang/jflex/psi/impl/JFlexTypeStatementImpl.java
rename to src/main/java/de/jflex/ide/idea/psi/impl/JFlexTypeStatementImpl.java
index d625faf..ca70533 100644
--- a/src/main/java/org/intellij/lang/jflex/psi/impl/JFlexTypeStatementImpl.java
+++ b/src/main/java/de/jflex/ide/idea/psi/impl/JFlexTypeStatementImpl.java
@@ -1,7 +1,7 @@
-package org.intellij.lang.jflex.psi.impl;
+package de.jflex.ide.idea.psi.impl;
 
 import com.intellij.lang.ASTNode;
-import org.intellij.lang.jflex.psi.JFlexTypeStatement;
+import de.jflex.ide.idea.psi.JFlexTypeStatement;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/org/intellij/lang/jflex/util/JFlexBundle.java b/src/main/java/de/jflex/ide/idea/util/JFlexBundle.java
similarity index 79%
rename from src/main/java/org/intellij/lang/jflex/util/JFlexBundle.java
rename to src/main/java/de/jflex/ide/idea/util/JFlexBundle.java
index 426c137..ddf0d37 100644
--- a/src/main/java/org/intellij/lang/jflex/util/JFlexBundle.java
+++ b/src/main/java/de/jflex/ide/idea/util/JFlexBundle.java
@@ -1,4 +1,4 @@
-package org.intellij.lang.jflex.util;
+package de.jflex.ide.idea.util;
 
 import com.intellij.CommonBundle;
 import org.jetbrains.annotations.NonNls;
@@ -8,7 +8,7 @@
 
 public final class JFlexBundle {
     @NonNls
-    private static final String BUNDLE_NAME = "org.intellij.lang.jflex.util.JFlexBundle";
+    private static final String BUNDLE_NAME = "de.jflex.ide.idea.util.JFlexBundle";
     private static final ResourceBundle BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
 
     private JFlexBundle() {
diff --git a/src/main/java/org/intellij/lang/jflex/util/JFlexBundle.properties b/src/main/java/de/jflex/ide/idea/util/JFlexBundle.properties
similarity index 100%
rename from src/main/java/org/intellij/lang/jflex/util/JFlexBundle.properties
rename to src/main/java/de/jflex/ide/idea/util/JFlexBundle.properties
diff --git a/src/main/java/org/intellij/lang/jflex/validation/JFlexAnnotatingVisitor.java b/src/main/java/de/jflex/ide/idea/validation/JFlexAnnotatingVisitor.java
similarity index 87%
rename from src/main/java/org/intellij/lang/jflex/validation/JFlexAnnotatingVisitor.java
rename to src/main/java/de/jflex/ide/idea/validation/JFlexAnnotatingVisitor.java
index 67f5d25..bfcbd49 100644
--- a/src/main/java/org/intellij/lang/jflex/validation/JFlexAnnotatingVisitor.java
+++ b/src/main/java/de/jflex/ide/idea/validation/JFlexAnnotatingVisitor.java
@@ -1,11 +1,11 @@
-package org.intellij.lang.jflex.validation;
+package de.jflex.ide.idea.validation;
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiReferenceExpression;
-import org.intellij.lang.jflex.psi.JFlexMacroReference;
+import de.jflex.ide.idea.psi.JFlexMacroReference;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 43b1494..173c981 100755
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -21,7 +21,7 @@
     </change-notes>
 
     <description>Enables JFlex support in IntelliJ IDEA.</description>
-    <resource-bundle>org.intellij.lang.jflex.util.JFlexBundle</resource-bundle>
+    <resource-bundle>de.jflex.ide.idea.util.JFlexBundle</resource-bundle>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
     <idea-version since-build="111.167"/>
@@ -33,19 +33,19 @@
     -->
 
     <extensions defaultExtensionNs="com.intellij">
-        <applicationConfigurable implementation="org.intellij.lang.jflex.options.JFlexConfigurable"/>
-        <colorSettingsPage implementation="org.intellij.lang.jflex.editor.colors.JFlexColorPage"/>
-        <lang.parserDefinition language="JFlex" implementationClass="org.intellij.lang.jflex.parser.JFlexParserDefinition"/>
-        <lang.documentationProvider language="JFlex" implementationClass="org.intellij.lang.jflex.JFlexDocumentationProvider"/>
-        <lang.findUsagesProvider language="JFlex" implementationClass="org.intellij.lang.jflex.JFlexFindUsagesProvider"/>
-        <lang.commenter language="JFlex" implementationClass="org.intellij.lang.jflex.JFlexCommenter"/>
-        <annotator language="JFlex" implementationClass="org.intellij.lang.jflex.validation.JFlexAnnotatingVisitor"/>
-        <languageInjector implementation="org.intellij.lang.jflex.injection.JFlexJavaInjector" />
-        <fileTypeFactory implementation="org.intellij.lang.jflex.fileTypes.JFlexFileTypeFactory" />
-        <compilerFactory implementation="org.intellij.lang.jflex.compiler.JFlexCompilerFactory" />
-
-        <applicationService serviceInterface="org.intellij.lang.jflex.options.JFlexSettings"
-                            serviceImplementation="org.intellij.lang.jflex.options.JFlexSettings" />
+        <applicationConfigurable implementation="de.jflex.ide.idea.options.JFlexConfigurable"/>
+        <colorSettingsPage implementation="de.jflex.ide.idea.editor.colors.JFlexColorPage"/>
+        <lang.parserDefinition language="JFlex" implementationClass="de.jflex.ide.idea.parser.JFlexParserDefinition"/>
+        <lang.documentationProvider language="JFlex" implementationClass="de.jflex.ide.idea.JFlexDocumentationProvider"/>
+        <lang.findUsagesProvider language="JFlex" implementationClass="de.jflex.ide.idea.JFlexFindUsagesProvider"/>
+        <lang.commenter language="JFlex" implementationClass="de.jflex.ide.idea.JFlexCommenter"/>
+        <annotator language="JFlex" implementationClass="de.jflex.ide.idea.validation.JFlexAnnotatingVisitor"/>
+        <languageInjector implementation="de.jflex.ide.idea.injection.JFlexJavaInjector" />
+        <fileTypeFactory implementation="de.jflex.ide.idea.fileTypes.JFlexFileTypeFactory" />
+        <compilerFactory implementation="de.jflex.ide.idea.compiler.JFlexCompilerFactory" />
+
+        <applicationService serviceInterface="de.jflex.ide.idea.options.JFlexSettings"
+                            serviceImplementation="de.jflex.ide.idea.options.JFlexSettings" />
     </extensions>
 
     <actions>