diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/CloudCompletionProposal.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/CloudCompletionProposal.java
index 1d56f2b..2bac32b 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/CloudCompletionProposal.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/CloudCompletionProposal.java
@@ -23,10 +23,10 @@
 //
 package org.incendo.cloud.spring;
 
-import cloud.commandframework.arguments.suggestion.Suggestion;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.incendo.cloud.suggestion.Suggestion;
 import org.springframework.shell.CompletionProposal;
 
 @API(status = API.Status.STABLE, since = "1.0.0")
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandManager.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandManager.java
index 9147a11..957e856 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandManager.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandManager.java
@@ -23,24 +23,24 @@
 //
 package org.incendo.cloud.spring;
 
-import cloud.commandframework.CommandManager;
-import cloud.commandframework.arguments.suggestion.SuggestionFactory;
-import cloud.commandframework.arguments.suggestion.Suggestions;
-import cloud.commandframework.context.CommandInput;
-import cloud.commandframework.exceptions.ArgumentParseException;
-import cloud.commandframework.exceptions.InvalidCommandSenderException;
-import cloud.commandframework.exceptions.InvalidSyntaxException;
-import cloud.commandframework.exceptions.NoPermissionException;
-import cloud.commandframework.exceptions.NoSuchCommandException;
-import cloud.commandframework.execution.ExecutionCoordinator;
-import cloud.commandframework.keys.CloudKey;
-import cloud.commandframework.util.StringUtils;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.CommandManager;
+import org.incendo.cloud.context.CommandInput;
+import org.incendo.cloud.exception.ArgumentParseException;
+import org.incendo.cloud.exception.InvalidCommandSenderException;
+import org.incendo.cloud.exception.InvalidSyntaxException;
+import org.incendo.cloud.exception.NoPermissionException;
+import org.incendo.cloud.exception.NoSuchCommandException;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.key.CloudKey;
 import org.incendo.cloud.spring.event.CommandExecutionEvent;
+import org.incendo.cloud.suggestion.SuggestionFactory;
+import org.incendo.cloud.suggestion.Suggestions;
+import org.incendo.cloud.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContext;
@@ -143,7 +143,8 @@ private void registerDefaultExceptionHandlers() {
                 .registerHandler(NoSuchCommandException.class, ctx -> LOGGER.error(MESSAGE_UNKNOWN_COMMAND))
                 .registerHandler(NoPermissionException.class, ctx -> LOGGER.error(MESSAGE_NO_PERMS))
                 .registerHandler(InvalidCommandSenderException.class, ctx -> LOGGER.error(ctx.exception().getMessage()))
-                .registerHandler(InvalidSyntaxException.class,
+                .registerHandler(
+                        InvalidSyntaxException.class,
                         ctx -> LOGGER.error(MESSAGE_INVALID_SYNTAX + ctx.exception().correctSyntax()));
     }
 }
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandRegistrationHandler.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandRegistrationHandler.java
index 96b4bfd..3e9e94b 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandRegistrationHandler.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringCommandRegistrationHandler.java
@@ -23,15 +23,15 @@
 //
 package org.incendo.cloud.spring;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.CommandComponent;
-import cloud.commandframework.internal.CommandRegistrationHandler;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.component.CommandComponent;
+import org.incendo.cloud.internal.CommandRegistrationHandler;
 import org.incendo.cloud.spring.event.CommandExecutionEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringInjectionService.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringInjectionService.java
index 775f266..d8d769b 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringInjectionService.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/SpringInjectionService.java
@@ -23,11 +23,11 @@
 //
 package org.incendo.cloud.spring;
 
-import cloud.commandframework.annotations.injection.InjectionRequest;
-import cloud.commandframework.annotations.injection.InjectionService;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.incendo.cloud.injection.InjectionRequest;
+import org.incendo.cloud.injection.InjectionService;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/annotation/ScanCommands.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/annotation/ScanCommands.java
index 577e05b..736ec33 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/annotation/ScanCommands.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/annotation/ScanCommands.java
@@ -31,7 +31,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 
 /**
- * Add this to a bean to make it get auto-parsed by the {@link cloud.commandframework.annotations.AnnotationParser}.
+ * Add this to a bean to make it get auto-parsed by the {@link org.incendo.cloud.annotations.AnnotationParser}.
  *
  * @since 1.0.0
  */
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/config/CloudSpringConfig.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/config/CloudSpringConfig.java
index 4ac8bae..341c7ac 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/config/CloudSpringConfig.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/config/CloudSpringConfig.java
@@ -23,9 +23,9 @@
 //
 package org.incendo.cloud.spring.config;
 
-import cloud.commandframework.execution.ExecutionCoordinator;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.execution.ExecutionCoordinator;
 import org.incendo.cloud.spring.CommandSenderMapper;
 import org.incendo.cloud.spring.SpringCommandPermissionHandler;
 import org.incendo.cloud.spring.SpringCommandSender;
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/event/CommandExecutionEvent.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/event/CommandExecutionEvent.java
index a620394..c3dc67d 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/event/CommandExecutionEvent.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/event/CommandExecutionEvent.java
@@ -23,12 +23,12 @@
 //
 package org.incendo.cloud.spring.event;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.execution.CommandResult;
 import java.io.Serial;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.execution.CommandResult;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.shell.command.CommandContext;
 
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/AnnotationRegistrar.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/AnnotationRegistrar.java
index 2582cbb..b33f18b 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/AnnotationRegistrar.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/AnnotationRegistrar.java
@@ -23,10 +23,10 @@
 //
 package org.incendo.cloud.spring.registrar;
 
-import cloud.commandframework.annotations.AnnotationParser;
 import java.util.Collection;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.annotations.AnnotationParser;
 import org.incendo.cloud.spring.SpringCommandManager;
 import org.incendo.cloud.spring.annotation.ScanCommands;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
diff --git a/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/BeanRegistrar.java b/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/BeanRegistrar.java
index bf4f077..5efd3b2 100644
--- a/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/BeanRegistrar.java
+++ b/cloud-spring/src/main/java/org/incendo/cloud/spring/registrar/BeanRegistrar.java
@@ -23,10 +23,10 @@
 //
 package org.incendo.cloud.spring.registrar;
 
-import cloud.commandframework.CommandBean;
 import java.util.List;
 import org.apiguardian.api.API;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.bean.CommandBean;
 import org.incendo.cloud.spring.SpringCommandManager;
 import org.springframework.stereotype.Component;
 
diff --git a/cloud-spring/src/test/java/org/incendo/cloud/spring/ApplicationIntegrationTest.java b/cloud-spring/src/test/java/org/incendo/cloud/spring/ApplicationIntegrationTest.java
index 06a75d1..c768296 100644
--- a/cloud-spring/src/test/java/org/incendo/cloud/spring/ApplicationIntegrationTest.java
+++ b/cloud-spring/src/test/java/org/incendo/cloud/spring/ApplicationIntegrationTest.java
@@ -23,14 +23,14 @@
 //
 package org.incendo.cloud.spring;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.CommandBean;
-import cloud.commandframework.CommandProperties;
-import cloud.commandframework.context.CommandContext;
-import cloud.commandframework.context.StandardCommandContextFactory;
-import cloud.commandframework.execution.ExecutionCoordinator;
-import cloud.commandframework.internal.CommandNode;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.bean.CommandBean;
+import org.incendo.cloud.bean.CommandProperties;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.context.StandardCommandContextFactory;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.internal.CommandNode;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/cloud-spring/src/test/java/org/incendo/cloud/spring/ShellIntegrationTest.java b/cloud-spring/src/test/java/org/incendo/cloud/spring/ShellIntegrationTest.java
index f439786..344c065 100644
--- a/cloud-spring/src/test/java/org/incendo/cloud/spring/ShellIntegrationTest.java
+++ b/cloud-spring/src/test/java/org/incendo/cloud/spring/ShellIntegrationTest.java
@@ -23,17 +23,17 @@
 //
 package org.incendo.cloud.spring;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.CommandBean;
-import cloud.commandframework.CommandDescription;
-import cloud.commandframework.CommandProperties;
-import cloud.commandframework.arguments.flags.CommandFlag;
-import cloud.commandframework.context.CommandContext;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.bean.CommandBean;
+import org.incendo.cloud.bean.CommandProperties;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.description.CommandDescription;
+import org.incendo.cloud.parser.flag.CommandFlag;
 import org.incendo.cloud.spring.config.CloudSpringConfig;
 import org.incendo.cloud.spring.registrar.BeanRegistrar;
 import org.incendo.cloud.spring.registrar.CommandRegistrationCoordinator;
@@ -48,10 +48,10 @@
 import org.springframework.shell.test.autoconfigure.ShellTest;
 import org.springframework.test.context.ContextConfiguration;
 
-import static cloud.commandframework.arguments.standard.IntegerParser.integerParser;
-import static cloud.commandframework.arguments.standard.StringParser.stringParser;
 import static com.google.common.truth.Truth.assertThat;
 import static org.awaitility.Awaitility.await;
+import static org.incendo.cloud.parser.standard.IntegerParser.integerParser;
+import static org.incendo.cloud.parser.standard.StringParser.stringParser;
 
 @Import(CloudSpringConfig.class)
 @ContextConfiguration(classes = {
diff --git a/example/src/main/java/org/incendo/cloud/spring/example/ExampleConfig.java b/example/src/main/java/org/incendo/cloud/spring/example/ExampleConfig.java
index cf139ee..957eafa 100644
--- a/example/src/main/java/org/incendo/cloud/spring/example/ExampleConfig.java
+++ b/example/src/main/java/org/incendo/cloud/spring/example/ExampleConfig.java
@@ -23,8 +23,8 @@
 //
 package org.incendo.cloud.spring.example;
 
-import cloud.commandframework.annotations.AnnotationParser;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.annotations.AnnotationParser;
 import org.incendo.cloud.spring.SpringCommandManager;
 import org.incendo.cloud.spring.SpringCommandSender;
 import org.incendo.cloud.spring.annotation.CommandGroup;
diff --git a/example/src/main/java/org/incendo/cloud/spring/example/commands/AddCatCommand.java b/example/src/main/java/org/incendo/cloud/spring/example/commands/AddCatCommand.java
index 6647312..939c68c 100644
--- a/example/src/main/java/org/incendo/cloud/spring/example/commands/AddCatCommand.java
+++ b/example/src/main/java/org/incendo/cloud/spring/example/commands/AddCatCommand.java
@@ -23,29 +23,29 @@
 //
 package org.incendo.cloud.spring.example.commands;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.CommandBean;
-import cloud.commandframework.CommandProperties;
-import cloud.commandframework.arguments.aggregate.AggregateParser;
-import cloud.commandframework.arguments.flags.CommandFlag;
-import cloud.commandframework.arguments.parser.ArgumentParseResult;
-import cloud.commandframework.arguments.suggestion.SuggestionProvider;
-import cloud.commandframework.context.CommandContext;
-import cloud.commandframework.meta.CommandMeta;
 import java.util.List;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.bean.CommandBean;
+import org.incendo.cloud.bean.CommandProperties;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.meta.CommandMeta;
+import org.incendo.cloud.parser.ArgumentParseResult;
+import org.incendo.cloud.parser.aggregate.AggregateParser;
+import org.incendo.cloud.parser.flag.CommandFlag;
 import org.incendo.cloud.spring.CloudCompletionProposal;
 import org.incendo.cloud.spring.SpringCommandManager;
 import org.incendo.cloud.spring.SpringCommandSender;
 import org.incendo.cloud.spring.example.model.Cat;
 import org.incendo.cloud.spring.example.service.CatService;
+import org.incendo.cloud.suggestion.SuggestionProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import static cloud.commandframework.CommandDescription.commandDescription;
-import static cloud.commandframework.arguments.standard.IntegerParser.integerParser;
-import static cloud.commandframework.arguments.standard.StringParser.stringParser;
+import static org.incendo.cloud.description.CommandDescription.commandDescription;
+import static org.incendo.cloud.parser.standard.IntegerParser.integerParser;
+import static org.incendo.cloud.parser.standard.StringParser.stringParser;
 
 @Component
 public class AddCatCommand extends CommandBean<SpringCommandSender> {
diff --git a/example/src/main/java/org/incendo/cloud/spring/example/commands/ListCatCommand.java b/example/src/main/java/org/incendo/cloud/spring/example/commands/ListCatCommand.java
index d9aaed8..d00016b 100644
--- a/example/src/main/java/org/incendo/cloud/spring/example/commands/ListCatCommand.java
+++ b/example/src/main/java/org/incendo/cloud/spring/example/commands/ListCatCommand.java
@@ -23,9 +23,9 @@
 //
 package org.incendo.cloud.spring.example.commands;
 
-import cloud.commandframework.annotations.Command;
-import cloud.commandframework.annotations.CommandDescription;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.annotations.Command;
+import org.incendo.cloud.annotations.CommandDescription;
 import org.incendo.cloud.spring.SpringCommandSender;
 import org.incendo.cloud.spring.annotation.CommandGroup;
 import org.incendo.cloud.spring.annotation.ScanCommands;
diff --git a/example/src/main/java/org/incendo/cloud/spring/example/commands/RemoveCatCommand.java b/example/src/main/java/org/incendo/cloud/spring/example/commands/RemoveCatCommand.java
index 103a1bb..1586b1f 100644
--- a/example/src/main/java/org/incendo/cloud/spring/example/commands/RemoveCatCommand.java
+++ b/example/src/main/java/org/incendo/cloud/spring/example/commands/RemoveCatCommand.java
@@ -23,25 +23,25 @@
 //
 package org.incendo.cloud.spring.example.commands;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.CommandBean;
-import cloud.commandframework.CommandProperties;
-import cloud.commandframework.arguments.suggestion.Suggestion;
-import cloud.commandframework.arguments.suggestion.SuggestionProvider;
-import cloud.commandframework.context.CommandContext;
-import cloud.commandframework.meta.CommandMeta;
 import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.bean.CommandBean;
+import org.incendo.cloud.bean.CommandProperties;
+import org.incendo.cloud.context.CommandContext;
+import org.incendo.cloud.meta.CommandMeta;
 import org.incendo.cloud.spring.SpringCommandManager;
 import org.incendo.cloud.spring.SpringCommandSender;
 import org.incendo.cloud.spring.example.model.Cat;
 import org.incendo.cloud.spring.example.service.CatService;
+import org.incendo.cloud.suggestion.Suggestion;
+import org.incendo.cloud.suggestion.SuggestionProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import static cloud.commandframework.CommandDescription.commandDescription;
-import static cloud.commandframework.arguments.standard.StringParser.stringParser;
+import static org.incendo.cloud.description.CommandDescription.commandDescription;
+import static org.incendo.cloud.parser.standard.StringParser.stringParser;
 
 @Component
 public class RemoveCatCommand extends CommandBean<SpringCommandSender> {
diff --git a/gradle.properties b/gradle.properties
index 13e9654..5d13482 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-group=cloud.commandframework
+group=org.incendo
 version=1.0.0-SNAPSHOT
 description=cloud-spring
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9799422..ed6ed7a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ kotlin = "1.9.22"
 graal = "0.9.28"
 
 slf4j = "2.0.11"
-cloud = "2.0.0-SNAPSHOT"
+cloud = "2.0.0-beta.1"
 
 springShellBom = "3.2.1"
 
@@ -38,8 +38,8 @@ spring-shell-test = { group = "org.springframework.shell", name = "spring-shell-
 spring-shell-test-autoconfiguration = { group = "org.springframework.shell", name = "spring-shell-test-autoconfigure" }
 
 # Cloud
-cloud-core = { group = "cloud.commandframework", name = "cloud-core", version.ref = "cloud" }
-cloud-annotations = { group = "cloud.commandframework", name = "cloud-annotations", version.ref = "cloud" }
+cloud-core = { group = "org.incendo", name = "cloud-core", version.ref = "cloud" }
+cloud-annotations = { group = "org.incendo", name = "cloud-annotations", version.ref = "cloud" }
 
 # Test
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }