diff --git a/.classpath b/common/.classpath
similarity index 100%
rename from .classpath
rename to common/.classpath
diff --git a/.github/CODEOWNERS b/common/.github/CODEOWNERS
similarity index 100%
rename from .github/CODEOWNERS
rename to common/.github/CODEOWNERS
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/common/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to common/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/common/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to common/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/bugfix.md b/common/.github/PULL_REQUEST_TEMPLATE/bugfix.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/bugfix.md
rename to common/.github/PULL_REQUEST_TEMPLATE/bugfix.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_integration.md b/common/.github/PULL_REQUEST_TEMPLATE/feature_integration.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/feature_integration.md
rename to common/.github/PULL_REQUEST_TEMPLATE/feature_integration.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md b/common/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
rename to common/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
diff --git a/.github/workflows/maven.yml b/common/.github/workflows/maven.yml
similarity index 100%
rename from .github/workflows/maven.yml
rename to common/.github/workflows/maven.yml
diff --git a/.gitignore b/common/.gitignore
similarity index 100%
rename from .gitignore
rename to common/.gitignore
diff --git a/.project b/common/.project
similarity index 100%
rename from .project
rename to common/.project
diff --git a/.settings/org.eclipse.core.resources.prefs b/common/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from .settings/org.eclipse.core.resources.prefs
rename to common/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/common/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.core.prefs
rename to common/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/common/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.ui.prefs
rename to common/.settings/org.eclipse.jdt.ui.prefs
diff --git a/.settings/org.eclipse.m2e.core.prefs b/common/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from .settings/org.eclipse.m2e.core.prefs
rename to common/.settings/org.eclipse.m2e.core.prefs
diff --git a/.settings/org.eclipse.wst.common.component b/common/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from .settings/org.eclipse.wst.common.component
rename to common/.settings/org.eclipse.wst.common.component
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/common/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from .settings/org.eclipse.wst.common.project.facet.core.xml
rename to common/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/.settings/org.eclipse.wst.validation.prefs b/common/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from .settings/org.eclipse.wst.validation.prefs
rename to common/.settings/org.eclipse.wst.validation.prefs
diff --git a/CODE_OF_CONDUCT.md b/common/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to common/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/common/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to common/CONTRIBUTING.md
diff --git a/LICENSE b/common/LICENSE
similarity index 100%
rename from LICENSE
rename to common/LICENSE
diff --git a/README.md b/common/README.md
similarity index 100%
rename from README.md
rename to common/README.md
diff --git a/pom.xml b/common/pom.xml
similarity index 100%
rename from pom.xml
rename to common/pom.xml
diff --git a/src/main/java/envoy/data/Attachment.java b/common/src/main/java/envoy/data/Attachment.java
similarity index 100%
rename from src/main/java/envoy/data/Attachment.java
rename to common/src/main/java/envoy/data/Attachment.java
diff --git a/src/main/java/envoy/data/Config.java b/common/src/main/java/envoy/data/Config.java
similarity index 100%
rename from src/main/java/envoy/data/Config.java
rename to common/src/main/java/envoy/data/Config.java
diff --git a/src/main/java/envoy/data/ConfigItem.java b/common/src/main/java/envoy/data/ConfigItem.java
similarity index 100%
rename from src/main/java/envoy/data/ConfigItem.java
rename to common/src/main/java/envoy/data/ConfigItem.java
diff --git a/src/main/java/envoy/data/Contact.java b/common/src/main/java/envoy/data/Contact.java
similarity index 100%
rename from src/main/java/envoy/data/Contact.java
rename to common/src/main/java/envoy/data/Contact.java
diff --git a/src/main/java/envoy/data/Group.java b/common/src/main/java/envoy/data/Group.java
similarity index 100%
rename from src/main/java/envoy/data/Group.java
rename to common/src/main/java/envoy/data/Group.java
diff --git a/src/main/java/envoy/data/GroupMessage.java b/common/src/main/java/envoy/data/GroupMessage.java
similarity index 100%
rename from src/main/java/envoy/data/GroupMessage.java
rename to common/src/main/java/envoy/data/GroupMessage.java
diff --git a/src/main/java/envoy/data/IDGenerator.java b/common/src/main/java/envoy/data/IDGenerator.java
similarity index 100%
rename from src/main/java/envoy/data/IDGenerator.java
rename to common/src/main/java/envoy/data/IDGenerator.java
diff --git a/src/main/java/envoy/data/LoginCredentials.java b/common/src/main/java/envoy/data/LoginCredentials.java
similarity index 100%
rename from src/main/java/envoy/data/LoginCredentials.java
rename to common/src/main/java/envoy/data/LoginCredentials.java
diff --git a/src/main/java/envoy/data/Message.java b/common/src/main/java/envoy/data/Message.java
similarity index 100%
rename from src/main/java/envoy/data/Message.java
rename to common/src/main/java/envoy/data/Message.java
diff --git a/src/main/java/envoy/data/MessageBuilder.java b/common/src/main/java/envoy/data/MessageBuilder.java
similarity index 100%
rename from src/main/java/envoy/data/MessageBuilder.java
rename to common/src/main/java/envoy/data/MessageBuilder.java
diff --git a/src/main/java/envoy/data/User.java b/common/src/main/java/envoy/data/User.java
similarity index 100%
rename from src/main/java/envoy/data/User.java
rename to common/src/main/java/envoy/data/User.java
diff --git a/src/main/java/envoy/data/package-info.java b/common/src/main/java/envoy/data/package-info.java
similarity index 100%
rename from src/main/java/envoy/data/package-info.java
rename to common/src/main/java/envoy/data/package-info.java
diff --git a/src/main/java/envoy/event/ElementOperation.java b/common/src/main/java/envoy/event/ElementOperation.java
similarity index 100%
rename from src/main/java/envoy/event/ElementOperation.java
rename to common/src/main/java/envoy/event/ElementOperation.java
diff --git a/src/main/java/envoy/event/Event.java b/common/src/main/java/envoy/event/Event.java
similarity index 100%
rename from src/main/java/envoy/event/Event.java
rename to common/src/main/java/envoy/event/Event.java
diff --git a/src/main/java/envoy/event/EventBus.java b/common/src/main/java/envoy/event/EventBus.java
similarity index 100%
rename from src/main/java/envoy/event/EventBus.java
rename to common/src/main/java/envoy/event/EventBus.java
diff --git a/src/main/java/envoy/event/GroupCreation.java b/common/src/main/java/envoy/event/GroupCreation.java
similarity index 100%
rename from src/main/java/envoy/event/GroupCreation.java
rename to common/src/main/java/envoy/event/GroupCreation.java
diff --git a/src/main/java/envoy/event/GroupMessageStatusChange.java b/common/src/main/java/envoy/event/GroupMessageStatusChange.java
similarity index 100%
rename from src/main/java/envoy/event/GroupMessageStatusChange.java
rename to common/src/main/java/envoy/event/GroupMessageStatusChange.java
diff --git a/src/main/java/envoy/event/GroupResize.java b/common/src/main/java/envoy/event/GroupResize.java
similarity index 100%
rename from src/main/java/envoy/event/GroupResize.java
rename to common/src/main/java/envoy/event/GroupResize.java
diff --git a/src/main/java/envoy/event/HandshakeRejection.java b/common/src/main/java/envoy/event/HandshakeRejection.java
similarity index 100%
rename from src/main/java/envoy/event/HandshakeRejection.java
rename to common/src/main/java/envoy/event/HandshakeRejection.java
diff --git a/src/main/java/envoy/event/IDGeneratorRequest.java b/common/src/main/java/envoy/event/IDGeneratorRequest.java
similarity index 100%
rename from src/main/java/envoy/event/IDGeneratorRequest.java
rename to common/src/main/java/envoy/event/IDGeneratorRequest.java
diff --git a/src/main/java/envoy/event/MessageStatusChange.java b/common/src/main/java/envoy/event/MessageStatusChange.java
similarity index 100%
rename from src/main/java/envoy/event/MessageStatusChange.java
rename to common/src/main/java/envoy/event/MessageStatusChange.java
diff --git a/src/main/java/envoy/event/NameChange.java b/common/src/main/java/envoy/event/NameChange.java
similarity index 100%
rename from src/main/java/envoy/event/NameChange.java
rename to common/src/main/java/envoy/event/NameChange.java
diff --git a/src/main/java/envoy/event/UserStatusChange.java b/common/src/main/java/envoy/event/UserStatusChange.java
similarity index 100%
rename from src/main/java/envoy/event/UserStatusChange.java
rename to common/src/main/java/envoy/event/UserStatusChange.java
diff --git a/src/main/java/envoy/event/contact/ContactOperation.java b/common/src/main/java/envoy/event/contact/ContactOperation.java
similarity index 100%
rename from src/main/java/envoy/event/contact/ContactOperation.java
rename to common/src/main/java/envoy/event/contact/ContactOperation.java
diff --git a/src/main/java/envoy/event/contact/ContactSearchRequest.java b/common/src/main/java/envoy/event/contact/ContactSearchRequest.java
similarity index 100%
rename from src/main/java/envoy/event/contact/ContactSearchRequest.java
rename to common/src/main/java/envoy/event/contact/ContactSearchRequest.java
diff --git a/src/main/java/envoy/event/contact/ContactSearchResult.java b/common/src/main/java/envoy/event/contact/ContactSearchResult.java
similarity index 100%
rename from src/main/java/envoy/event/contact/ContactSearchResult.java
rename to common/src/main/java/envoy/event/contact/ContactSearchResult.java
diff --git a/src/main/java/envoy/event/contact/package-info.java b/common/src/main/java/envoy/event/contact/package-info.java
similarity index 100%
rename from src/main/java/envoy/event/contact/package-info.java
rename to common/src/main/java/envoy/event/contact/package-info.java
diff --git a/src/main/java/envoy/event/package-info.java b/common/src/main/java/envoy/event/package-info.java
similarity index 100%
rename from src/main/java/envoy/event/package-info.java
rename to common/src/main/java/envoy/event/package-info.java
diff --git a/src/main/java/envoy/exception/EnvoyException.java b/common/src/main/java/envoy/exception/EnvoyException.java
similarity index 100%
rename from src/main/java/envoy/exception/EnvoyException.java
rename to common/src/main/java/envoy/exception/EnvoyException.java
diff --git a/src/main/java/envoy/exception/package-info.java b/common/src/main/java/envoy/exception/package-info.java
similarity index 100%
rename from src/main/java/envoy/exception/package-info.java
rename to common/src/main/java/envoy/exception/package-info.java
diff --git a/src/main/java/envoy/util/Bounds.java b/common/src/main/java/envoy/util/Bounds.java
similarity index 100%
rename from src/main/java/envoy/util/Bounds.java
rename to common/src/main/java/envoy/util/Bounds.java
diff --git a/src/main/java/envoy/util/EnvoyLog.java b/common/src/main/java/envoy/util/EnvoyLog.java
similarity index 100%
rename from src/main/java/envoy/util/EnvoyLog.java
rename to common/src/main/java/envoy/util/EnvoyLog.java
diff --git a/src/main/java/envoy/util/SerializationUtils.java b/common/src/main/java/envoy/util/SerializationUtils.java
similarity index 100%
rename from src/main/java/envoy/util/SerializationUtils.java
rename to common/src/main/java/envoy/util/SerializationUtils.java
diff --git a/src/main/java/envoy/util/package-info.java b/common/src/main/java/envoy/util/package-info.java
similarity index 100%
rename from src/main/java/envoy/util/package-info.java
rename to common/src/main/java/envoy/util/package-info.java
diff --git a/src/main/java/module-info.java b/common/src/main/java/module-info.java
similarity index 100%
rename from src/main/java/module-info.java
rename to common/src/main/java/module-info.java
diff --git a/src/test/java/envoy/data/UserTest.java b/common/src/test/java/envoy/data/UserTest.java
similarity index 100%
rename from src/test/java/envoy/data/UserTest.java
rename to common/src/test/java/envoy/data/UserTest.java