diff --git a/gridsome.server.js b/gridsome.server.js
index 2d32bc49..9becda52 100644
--- a/gridsome.server.js
+++ b/gridsome.server.js
@@ -14,10 +14,10 @@ module.exports = function (api) {
           .options({ appendTsSuffixTo: [/\.vue$/] });
     
     globby.sync('./packages/*', { onlyDirectories: true })
-      .map(name => name.replace('./packages/tiptap-', ''))
+      .map(name => name.replace('./packages/', ''))
       .forEach(name => {
         config.resolve.alias
-          .set(`@tiptap/${name}`, path.resolve(`./packages/tiptap-${name}`))
+          .set(`@tiptap/${name}`, path.resolve(`./packages/${name}`))
       })
   })
 }
diff --git a/packages/tiptap-core/index.ts b/packages/core/index.ts
similarity index 100%
rename from packages/tiptap-core/index.ts
rename to packages/core/index.ts
diff --git a/packages/tiptap-core/package.json b/packages/core/package.json
similarity index 100%
rename from packages/tiptap-core/package.json
rename to packages/core/package.json
diff --git a/packages/tiptap-core/src/Editor.ts b/packages/core/src/Editor.ts
similarity index 100%
rename from packages/tiptap-core/src/Editor.ts
rename to packages/core/src/Editor.ts
diff --git a/packages/tiptap-core/src/Extension.ts b/packages/core/src/Extension.ts
similarity index 100%
rename from packages/tiptap-core/src/Extension.ts
rename to packages/core/src/Extension.ts
diff --git a/packages/tiptap-core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
similarity index 100%
rename from packages/tiptap-core/src/ExtensionManager.ts
rename to packages/core/src/ExtensionManager.ts
diff --git a/packages/tiptap-core/src/Node.ts b/packages/core/src/Node.ts
similarity index 100%
rename from packages/tiptap-core/src/Node.ts
rename to packages/core/src/Node.ts
diff --git a/packages/tiptap-core/src/commands/clearContent.ts b/packages/core/src/commands/clearContent.ts
similarity index 100%
rename from packages/tiptap-core/src/commands/clearContent.ts
rename to packages/core/src/commands/clearContent.ts
diff --git a/packages/tiptap-core/src/commands/focus.ts b/packages/core/src/commands/focus.ts
similarity index 100%
rename from packages/tiptap-core/src/commands/focus.ts
rename to packages/core/src/commands/focus.ts
diff --git a/packages/tiptap-core/src/commands/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
similarity index 100%
rename from packages/tiptap-core/src/commands/insertHTML.ts
rename to packages/core/src/commands/insertHTML.ts
diff --git a/packages/tiptap-core/src/commands/insertText.ts b/packages/core/src/commands/insertText.ts
similarity index 100%
rename from packages/tiptap-core/src/commands/insertText.ts
rename to packages/core/src/commands/insertText.ts
diff --git a/packages/tiptap-core/src/commands/setContent.ts b/packages/core/src/commands/setContent.ts
similarity index 100%
rename from packages/tiptap-core/src/commands/setContent.ts
rename to packages/core/src/commands/setContent.ts
diff --git a/packages/tiptap-core/src/style.css b/packages/core/src/style.css
similarity index 100%
rename from packages/tiptap-core/src/style.css
rename to packages/core/src/style.css
diff --git a/packages/tiptap-core/src/utils/elementFromString.ts b/packages/core/src/utils/elementFromString.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/elementFromString.ts
rename to packages/core/src/utils/elementFromString.ts
diff --git a/packages/tiptap-core/src/utils/getAllMethodNames.ts b/packages/core/src/utils/getAllMethodNames.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/getAllMethodNames.ts
rename to packages/core/src/utils/getAllMethodNames.ts
diff --git a/packages/tiptap-core/src/utils/getMarkAttrs.ts b/packages/core/src/utils/getMarkAttrs.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/getMarkAttrs.ts
rename to packages/core/src/utils/getMarkAttrs.ts
diff --git a/packages/tiptap-core/src/utils/injectCSS.ts b/packages/core/src/utils/injectCSS.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/injectCSS.ts
rename to packages/core/src/utils/injectCSS.ts
diff --git a/packages/tiptap-core/src/utils/magicMethods.ts b/packages/core/src/utils/magicMethods.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/magicMethods.ts
rename to packages/core/src/utils/magicMethods.ts
diff --git a/packages/tiptap-core/src/utils/markIsActive.ts b/packages/core/src/utils/markIsActive.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/markIsActive.ts
rename to packages/core/src/utils/markIsActive.ts
diff --git a/packages/tiptap-core/src/utils/minMax.ts b/packages/core/src/utils/minMax.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/minMax.ts
rename to packages/core/src/utils/minMax.ts
diff --git a/packages/tiptap-core/src/utils/nodeIsActive.ts b/packages/core/src/utils/nodeIsActive.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/nodeIsActive.ts
rename to packages/core/src/utils/nodeIsActive.ts
diff --git a/packages/tiptap-core/src/utils/sleep.ts b/packages/core/src/utils/sleep.ts
similarity index 100%
rename from packages/tiptap-core/src/utils/sleep.ts
rename to packages/core/src/utils/sleep.ts
diff --git a/packages/tiptap-extension-document/index.ts b/packages/extension-document/index.ts
similarity index 100%
rename from packages/tiptap-extension-document/index.ts
rename to packages/extension-document/index.ts
diff --git a/packages/tiptap-extension-document/package.json b/packages/extension-document/package.json
similarity index 100%
rename from packages/tiptap-extension-document/package.json
rename to packages/extension-document/package.json
diff --git a/packages/tiptap-extension-history/index.ts b/packages/extension-history/index.ts
similarity index 100%
rename from packages/tiptap-extension-history/index.ts
rename to packages/extension-history/index.ts
diff --git a/packages/tiptap-extension-history/package.json b/packages/extension-history/package.json
similarity index 100%
rename from packages/tiptap-extension-history/package.json
rename to packages/extension-history/package.json
diff --git a/packages/tiptap-extension-paragraph/index.ts b/packages/extension-paragraph/index.ts
similarity index 100%
rename from packages/tiptap-extension-paragraph/index.ts
rename to packages/extension-paragraph/index.ts
diff --git a/packages/tiptap-extension-paragraph/package.json b/packages/extension-paragraph/package.json
similarity index 100%
rename from packages/tiptap-extension-paragraph/package.json
rename to packages/extension-paragraph/package.json
diff --git a/packages/tiptap-extension-text/index.ts b/packages/extension-text/index.ts
similarity index 100%
rename from packages/tiptap-extension-text/index.ts
rename to packages/extension-text/index.ts
diff --git a/packages/tiptap-extension-text/package.json b/packages/extension-text/package.json
similarity index 100%
rename from packages/tiptap-extension-text/package.json
rename to packages/extension-text/package.json
diff --git a/packages/tiptap-starter-kit/index.ts b/packages/starter-kit/index.ts
similarity index 100%
rename from packages/tiptap-starter-kit/index.ts
rename to packages/starter-kit/index.ts
diff --git a/packages/tiptap-starter-kit/package.json b/packages/starter-kit/package.json
similarity index 100%
rename from packages/tiptap-starter-kit/package.json
rename to packages/starter-kit/package.json
diff --git a/packages/tiptap-vue/index.ts b/packages/vue/index.ts
similarity index 100%
rename from packages/tiptap-vue/index.ts
rename to packages/vue/index.ts
diff --git a/packages/tiptap-vue/package.json b/packages/vue/package.json
similarity index 100%
rename from packages/tiptap-vue/package.json
rename to packages/vue/package.json
diff --git a/packages/tiptap-vue/src/components/EditorContent.ts b/packages/vue/src/components/EditorContent.ts
similarity index 100%
rename from packages/tiptap-vue/src/components/EditorContent.ts
rename to packages/vue/src/components/EditorContent.ts