diff --git a/build.gradle b/build.gradle
index 0913aaf..e96d7d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.intellij' version '0.4.21'
 }
 
-group 'org.jonahhenriksson'
+group 'org.ron-rs'
 version '1.3'
 
 sourceSets.main.java.srcDirs 'src/main/gen'
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/__RONLexer.java b/src/main/gen/org/jonahhenriksson/ron/language/__RONLexer.java
index 83964ae..8eaf0b0 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/__RONLexer.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/__RONLexer.java
@@ -2,12 +2,10 @@
 
 package org.jonahhenriksson.ron.language;
 
-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 org.jonahhenriksson.ron.language.psi.RONTypes.*;
 
 
 /**
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONBoolImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONBoolImpl.java
index e454d1d..1fd6574 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONBoolImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONBoolImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONListImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONListImpl.java
index 4905500..122951b 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONListImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONListImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapEntryImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapEntryImpl.java
index f29eb4d..a0c92f7 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapEntryImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapEntryImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapImpl.java
index 499089e..495d468 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONNamedFieldImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONNamedFieldImpl.java
index 27c30c3..48fc4ba 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONNamedFieldImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONNamedFieldImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONObjectImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONObjectImpl.java
index bbf2ab0..66a94cb 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONObjectImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONObjectImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONOptionImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONOptionImpl.java
index 50195b6..dc30a3c 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONOptionImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONOptionImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONValueImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONValueImpl.java
index 59d3135..1ddbd35 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONValueImpl.java
+++ b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONValueImpl.java
@@ -7,7 +7,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.util.PsiTreeUtil;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import org.jonahhenriksson.ron.language.psi.*;
 
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/parser/_RONParser.java b/src/main/gen/org/ron_rs/intellij_ron/language/parser/_RONParser.java
similarity index 98%
rename from src/main/gen/org/jonahhenriksson/ron/language/parser/_RONParser.java
rename to src/main/gen/org/ron_rs/intellij_ron/language/parser/_RONParser.java
index aec17ad..944cf0a 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/parser/_RONParser.java
+++ b/src/main/gen/org/ron_rs/intellij_ron/language/parser/_RONParser.java
@@ -1,10 +1,10 @@
 // This is a generated file. Not intended for manual editing.
-package org.jonahhenriksson.ron.language.parser;
+package org.ron_rs.intellij_ron.language.parser;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.PsiBuilder.Marker;
-import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
-import static org.jonahhenriksson.ron.language.psi.RONParserUtil.*;
+import static org.ron_rs.intellij_ron.language.psi.RONTypes.*;
+import static org.ron_rs.intellij_ron.language.psi.RONParserUtil.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.tree.TokenSet;
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/RONTypes.java b/src/main/gen/org/ron_rs/intellij_ron/language/psi/RONTypes.java
similarity index 98%
rename from src/main/gen/org/jonahhenriksson/ron/language/psi/RONTypes.java
rename to src/main/gen/org/ron_rs/intellij_ron/language/psi/RONTypes.java
index 94346f5..4d54431 100644
--- a/src/main/gen/org/jonahhenriksson/ron/language/psi/RONTypes.java
+++ b/src/main/gen/org/ron_rs/intellij_ron/language/psi/RONTypes.java
@@ -1,5 +1,5 @@
 // This is a generated file. Not intended for manual editing.
-package org.jonahhenriksson.ron.language.psi;
+package org.ron_rs.intellij_ron.language.psi;
 
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.PsiElement;
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RON.bnf b/src/main/java/org/ron_rs/intellij_ron/language/RON.bnf
similarity index 86%
rename from src/main/java/org/jonahhenriksson/ron/language/RON.bnf
rename to src/main/java/org/ron_rs/intellij_ron/language/RON.bnf
index deeb821..63878f2 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RON.bnf
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RON.bnf
@@ -1,6 +1,6 @@
 {
-    parserClass = "org.jonahhenriksson.ron.language.parser._RONParser"
-    parserUtilClass = "org.jonahhenriksson.ron.language.psi.RONParserUtil"
+    parserClass = "org.ron_rs.intellij_ron.language.parser._RONParser"
+    parserUtilClass = "org.ron_rs.intellij_ron.language.psi.RONParserUtil"
 
     extends = "com.intellij.extapi.psi.ASTWrapperPsiElement"
 
@@ -9,9 +9,9 @@
     psiPackage = "org.jonahhenriksson.ron.language.psi"
     psiImplPackage = "org.jonahhenriksson.ron.language.psi.impl"
 
-    elementTypeHolderClass = "org.jonahhenriksson.ron.language.psi.RONTypes"
-    elementTypeClass = "org.jonahhenriksson.ron.language.psi.RONElementType"
-    tokenTypeClass = "org.jonahhenriksson.ron.language.psi.RONTokenType"
+    elementTypeHolderClass = "org.ron_rs.intellij_ron.language.psi.RONTypes"
+    elementTypeClass = "org.ron_rs.intellij_ron.language.psi.RONElementType"
+    tokenTypeClass = "org.ron_rs.intellij_ron.language.psi.RONTokenType"
 
     psiImplUtilClass = "org.jonahhenriksson.ron.language.psi.impl.RONPsiImplUtil"
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RONCreateFile.java b/src/main/java/org/ron_rs/intellij_ron/language/RONCreateFile.java
similarity index 89%
rename from src/main/java/org/jonahhenriksson/ron/language/RONCreateFile.java
rename to src/main/java/org/ron_rs/intellij_ron/language/RONCreateFile.java
index a87e13e..e4b965d 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RONCreateFile.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RONCreateFile.java
@@ -1,15 +1,12 @@
-package org.jonahhenriksson.ron.language;
+package org.ron_rs.intellij_ron.language;
 
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.NlsActions;
 import com.intellij.openapi.util.NlsContexts;
 import com.intellij.psi.PsiDirectory;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public class RONCreateFile extends CreateFileFromTemplateAction {
 
     private static final String NAME = "RON File";
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RONFileType.java b/src/main/java/org/ron_rs/intellij_ron/language/RONFileType.java
similarity index 95%
rename from src/main/java/org/jonahhenriksson/ron/language/RONFileType.java
rename to src/main/java/org/ron_rs/intellij_ron/language/RONFileType.java
index a53eaad..8d720e3 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RONFileType.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RONFileType.java
@@ -1,4 +1,4 @@
-package org.jonahhenriksson.ron.language;
+package org.ron_rs.intellij_ron.language;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.util.NlsContexts;
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RONIcons.java b/src/main/java/org/ron_rs/intellij_ron/language/RONIcons.java
similarity index 80%
rename from src/main/java/org/jonahhenriksson/ron/language/RONIcons.java
rename to src/main/java/org/ron_rs/intellij_ron/language/RONIcons.java
index 35d6ae7..94a4c3d 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RONIcons.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RONIcons.java
@@ -1,4 +1,4 @@
-package org.jonahhenriksson.ron.language;
+package org.ron_rs.intellij_ron.language;
 
 import com.intellij.openapi.util.IconLoader;
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RONLanguage.java b/src/main/java/org/ron_rs/intellij_ron/language/RONLanguage.java
similarity index 83%
rename from src/main/java/org/jonahhenriksson/ron/language/RONLanguage.java
rename to src/main/java/org/ron_rs/intellij_ron/language/RONLanguage.java
index ddfbac3..ed0e38c 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RONLanguage.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RONLanguage.java
@@ -1,4 +1,4 @@
-package org.jonahhenriksson.ron.language;
+package org.ron_rs.intellij_ron.language;
 
 import com.intellij.lang.Language;
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RONLexerAdapter.java b/src/main/java/org/ron_rs/intellij_ron/language/RONLexerAdapter.java
similarity index 79%
rename from src/main/java/org/jonahhenriksson/ron/language/RONLexerAdapter.java
rename to src/main/java/org/ron_rs/intellij_ron/language/RONLexerAdapter.java
index fcd3da9..3381cbd 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RONLexerAdapter.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RONLexerAdapter.java
@@ -1,4 +1,4 @@
-package org.jonahhenriksson.ron.language;
+package org.ron_rs.intellij_ron.language;
 
 import com.intellij.lexer.FlexAdapter;
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RONParserDefinition.java b/src/main/java/org/ron_rs/intellij_ron/language/RONParserDefinition.java
similarity index 84%
rename from src/main/java/org/jonahhenriksson/ron/language/RONParserDefinition.java
rename to src/main/java/org/ron_rs/intellij_ron/language/RONParserDefinition.java
index 540bdd0..d7b2a69 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RONParserDefinition.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RONParserDefinition.java
@@ -1,4 +1,4 @@
-package org.jonahhenriksson.ron.language;
+package org.ron_rs.intellij_ron.language;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.ParserDefinition;
@@ -8,14 +8,12 @@
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.NotNull;
-import org.jonahhenriksson.ron.language.parser._RONParser;
-import org.jonahhenriksson.ron.language.psi.RONElementType;
-import org.jonahhenriksson.ron.language.psi.RONFile;
-import org.jonahhenriksson.ron.language.psi.RONTypes;
+import org.ron_rs.intellij_ron.language.parser._RONParser;
+import org.ron_rs.intellij_ron.language.psi.RONTypes;
+import org.ron_rs.intellij_ron.language.psi.RONFile;
 
 public class RONParserDefinition implements ParserDefinition {
     public static final TokenSet COMMENTS = TokenSet.create(RONTypes.COMMENT, RONTypes.BLOCK_COMMENT);
diff --git a/src/main/java/org/jonahhenriksson/ron/language/RONSyntaxHighlighter.java b/src/main/java/org/ron_rs/intellij_ron/language/RONSyntaxHighlighter.java
similarity index 98%
rename from src/main/java/org/jonahhenriksson/ron/language/RONSyntaxHighlighter.java
rename to src/main/java/org/ron_rs/intellij_ron/language/RONSyntaxHighlighter.java
index feac4b7..eb52fc7 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/RONSyntaxHighlighter.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/RONSyntaxHighlighter.java
@@ -1,4 +1,4 @@
-package org.jonahhenriksson.ron.language;
+package org.ron_rs.intellij_ron.language;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
@@ -8,7 +8,7 @@
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
-import org.jonahhenriksson.ron.language.psi.RONTypes;
+import org.ron_rs.intellij_ron.language.psi.RONTypes;
 
 public class RONSyntaxHighlighter extends SyntaxHighlighterBase {
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/__RONLexer.flex b/src/main/java/org/ron_rs/intellij_ron/language/__RONLexer.flex
similarity index 96%
rename from src/main/java/org/jonahhenriksson/ron/language/__RONLexer.flex
rename to src/main/java/org/ron_rs/intellij_ron/language/__RONLexer.flex
index 0e153ac..2f4a85a 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/__RONLexer.flex
+++ b/src/main/java/org/ron_rs/intellij_ron/language/__RONLexer.flex
@@ -1,11 +1,9 @@
 package org.jonahhenriksson.ron.language;
 
-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 org.jonahhenriksson.ron.language.psi.RONTypes.*;
 
 %%
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/psi/RONElementType.java b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONElementType.java
similarity index 75%
rename from src/main/java/org/jonahhenriksson/ron/language/psi/RONElementType.java
rename to src/main/java/org/ron_rs/intellij_ron/language/psi/RONElementType.java
index 836f734..8b2034e 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/psi/RONElementType.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONElementType.java
@@ -1,9 +1,9 @@
-package org.jonahhenriksson.ron.language.psi;
+package org.ron_rs.intellij_ron.language.psi;
 
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jonahhenriksson.ron.language.RONLanguage;
+import org.ron_rs.intellij_ron.language.RONLanguage;
 
 public class RONElementType extends IElementType {
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/psi/RONFile.java b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONFile.java
similarity index 73%
rename from src/main/java/org/jonahhenriksson/ron/language/psi/RONFile.java
rename to src/main/java/org/ron_rs/intellij_ron/language/psi/RONFile.java
index eb6c0bf..3efba3b 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/psi/RONFile.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONFile.java
@@ -1,12 +1,11 @@
-package org.jonahhenriksson.ron.language.psi;
+package org.ron_rs.intellij_ron.language.psi;
 
 import com.intellij.extapi.psi.PsiFileBase;
-import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
 import org.jetbrains.annotations.NotNull;
-import org.jonahhenriksson.ron.language.RONFileType;
-import org.jonahhenriksson.ron.language.RONLanguage;
+import org.ron_rs.intellij_ron.language.RONFileType;
+import org.ron_rs.intellij_ron.language.RONLanguage;
 
 public class RONFile extends PsiFileBase {
     public RONFile(@NotNull FileViewProvider viewProvider) {
diff --git a/src/main/java/org/jonahhenriksson/ron/language/psi/RONParserUtil.java b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONParserUtil.java
similarity index 72%
rename from src/main/java/org/jonahhenriksson/ron/language/psi/RONParserUtil.java
rename to src/main/java/org/ron_rs/intellij_ron/language/psi/RONParserUtil.java
index 974b1c2..b86de0e 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/psi/RONParserUtil.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONParserUtil.java
@@ -1,4 +1,4 @@
-package org.jonahhenriksson.ron.language.psi;
+package org.ron_rs.intellij_ron.language.psi;
 
 import com.intellij.lang.parser.GeneratedParserUtilBase;
 
diff --git a/src/main/java/org/jonahhenriksson/ron/language/psi/RONTokenType.java b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONTokenType.java
similarity index 80%
rename from src/main/java/org/jonahhenriksson/ron/language/psi/RONTokenType.java
rename to src/main/java/org/ron_rs/intellij_ron/language/psi/RONTokenType.java
index 539de9a..23d300b 100644
--- a/src/main/java/org/jonahhenriksson/ron/language/psi/RONTokenType.java
+++ b/src/main/java/org/ron_rs/intellij_ron/language/psi/RONTokenType.java
@@ -1,9 +1,9 @@
-package org.jonahhenriksson.ron.language.psi;
+package org.ron_rs.intellij_ron.language.psi;
 
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jonahhenriksson.ron.language.RONLanguage;
+import org.ron_rs.intellij_ron.language.RONLanguage;
 
 public class RONTokenType extends IElementType {
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index d736fc6..442b075 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
-    <id>org.jonahhenriksson.ron</id>
+    <id>org.ron_rs.intellij_ron</id>
     <name>RON</name>
-    <vendor>Jonah Henriksson</vendor>
+    <vendor>ron_rs</vendor>
 
     <description><![CDATA[
     Currently adds highlighting support for the RON (Rust Object Notation) data format.
@@ -10,13 +10,13 @@
     <depends>com.intellij.modules.platform</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <fileType name="RON file" implementationClass="org.jonahhenriksson.ron.language.RONFileType" fieldName="INSTANCE" language="RON" extensions="ron" />
-        <lang.parserDefinition language="RON" implementationClass="org.jonahhenriksson.ron.language.RONParserDefinition"/>
-        <lang.syntaxHighlighter language="RON" implementationClass="org.jonahhenriksson.ron.language.RONSyntaxHighlighter"/>
+        <fileType name="RON file" implementationClass="org.ron_rs.intellij_ron.language.RONFileType" fieldName="INSTANCE" language="RON" extensions="ron" />
+        <lang.parserDefinition language="RON" implementationClass="org.ron_rs.intellij_ron.language.RONParserDefinition"/>
+        <lang.syntaxHighlighter language="RON" implementationClass="org.ron_rs.intellij_ron.language.RONSyntaxHighlighter"/>
     </extensions>
     <actions>
-        <action id="org.jonahhenriksson.ron.language.RONCreateFile"
-                class="org.jonahhenriksson.ron.language.RONCreateFile" text="RON File"
+        <action id="org.ron_rs.intellij_ron.language.RONCreateFile"
+                class="org.ron_rs.intellij_ron.language.RONCreateFile" text="RON File"
                 description="Create new RON file">
             <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewFile"/>
         </action>