diff --git a/.classpath b/server/.classpath
similarity index 100%
rename from .classpath
rename to server/.classpath
diff --git a/.github/CODEOWNERS b/server/.github/CODEOWNERS
similarity index 100%
rename from .github/CODEOWNERS
rename to server/.github/CODEOWNERS
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/server/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to server/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/server/.github/ISSUE_TEMPLATE/feature_request.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/feature_request.md
rename to server/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/bugfix.md b/server/.github/PULL_REQUEST_TEMPLATE/bugfix.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/bugfix.md
rename to server/.github/PULL_REQUEST_TEMPLATE/bugfix.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/feature_integration.md b/server/.github/PULL_REQUEST_TEMPLATE/feature_integration.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/feature_integration.md
rename to server/.github/PULL_REQUEST_TEMPLATE/feature_integration.md
diff --git a/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md b/server/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
similarity index 100%
rename from .github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
rename to server/.github/PULL_REQUEST_TEMPLATE/javadoc_upgrade.md
diff --git a/.github/workflows/maven.yml b/server/.github/workflows/maven.yml
similarity index 100%
rename from .github/workflows/maven.yml
rename to server/.github/workflows/maven.yml
diff --git a/.github/workflows/stale.yml b/server/.github/workflows/stale.yml
similarity index 100%
rename from .github/workflows/stale.yml
rename to server/.github/workflows/stale.yml
diff --git a/.gitignore b/server/.gitignore
similarity index 100%
rename from .gitignore
rename to server/.gitignore
diff --git a/.project b/server/.project
similarity index 100%
rename from .project
rename to server/.project
diff --git a/.settings/org.eclipse.core.resources.prefs b/server/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from .settings/org.eclipse.core.resources.prefs
rename to server/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/server/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.core.prefs
rename to server/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/server/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from .settings/org.eclipse.jdt.ui.prefs
rename to server/.settings/org.eclipse.jdt.ui.prefs
diff --git a/.settings/org.eclipse.jpt.core.prefs b/server/.settings/org.eclipse.jpt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.jpt.core.prefs
rename to server/.settings/org.eclipse.jpt.core.prefs
diff --git a/.settings/org.eclipse.m2e.core.prefs b/server/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from .settings/org.eclipse.m2e.core.prefs
rename to server/.settings/org.eclipse.m2e.core.prefs
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/server/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
similarity index 100%
rename from .settings/org.eclipse.wst.common.project.facet.core.prefs.xml
rename to server/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/server/.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 server/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/.settings/org.hibernate.eclipse.console.prefs b/server/.settings/org.hibernate.eclipse.console.prefs
similarity index 100%
rename from .settings/org.hibernate.eclipse.console.prefs
rename to server/.settings/org.hibernate.eclipse.console.prefs
diff --git a/CODE_OF_CONDUCT.md b/server/CODE_OF_CONDUCT.md
similarity index 100%
rename from CODE_OF_CONDUCT.md
rename to server/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/server/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to server/CONTRIBUTING.md
diff --git a/LICENSE b/server/LICENSE
similarity index 100%
rename from LICENSE
rename to server/LICENSE
diff --git a/README.md b/server/README.md
similarity index 100%
rename from README.md
rename to server/README.md
diff --git a/drop_all_tables.sql b/server/drop_all_tables.sql
similarity index 100%
rename from drop_all_tables.sql
rename to server/drop_all_tables.sql
diff --git a/pom.xml b/server/pom.xml
similarity index 100%
rename from pom.xml
rename to server/pom.xml
diff --git a/src/main/java/envoy/server/Startup.java b/server/src/main/java/envoy/server/Startup.java
similarity index 100%
rename from src/main/java/envoy/server/Startup.java
rename to server/src/main/java/envoy/server/Startup.java
diff --git a/src/main/java/envoy/server/data/ConfigItem.java b/server/src/main/java/envoy/server/data/ConfigItem.java
similarity index 100%
rename from src/main/java/envoy/server/data/ConfigItem.java
rename to server/src/main/java/envoy/server/data/ConfigItem.java
diff --git a/src/main/java/envoy/server/data/Contact.java b/server/src/main/java/envoy/server/data/Contact.java
similarity index 100%
rename from src/main/java/envoy/server/data/Contact.java
rename to server/src/main/java/envoy/server/data/Contact.java
diff --git a/src/main/java/envoy/server/data/Group.java b/server/src/main/java/envoy/server/data/Group.java
similarity index 100%
rename from src/main/java/envoy/server/data/Group.java
rename to server/src/main/java/envoy/server/data/Group.java
diff --git a/src/main/java/envoy/server/data/GroupMessage.java b/server/src/main/java/envoy/server/data/GroupMessage.java
similarity index 100%
rename from src/main/java/envoy/server/data/GroupMessage.java
rename to server/src/main/java/envoy/server/data/GroupMessage.java
diff --git a/src/main/java/envoy/server/data/Message.java b/server/src/main/java/envoy/server/data/Message.java
similarity index 100%
rename from src/main/java/envoy/server/data/Message.java
rename to server/src/main/java/envoy/server/data/Message.java
diff --git a/src/main/java/envoy/server/data/PersistenceManager.java b/server/src/main/java/envoy/server/data/PersistenceManager.java
similarity index 100%
rename from src/main/java/envoy/server/data/PersistenceManager.java
rename to server/src/main/java/envoy/server/data/PersistenceManager.java
diff --git a/src/main/java/envoy/server/data/User.java b/server/src/main/java/envoy/server/data/User.java
similarity index 100%
rename from src/main/java/envoy/server/data/User.java
rename to server/src/main/java/envoy/server/data/User.java
diff --git a/src/main/java/envoy/server/data/package-info.java b/server/src/main/java/envoy/server/data/package-info.java
similarity index 100%
rename from src/main/java/envoy/server/data/package-info.java
rename to server/src/main/java/envoy/server/data/package-info.java
diff --git a/src/main/java/envoy/server/net/ConnectionManager.java b/server/src/main/java/envoy/server/net/ConnectionManager.java
similarity index 100%
rename from src/main/java/envoy/server/net/ConnectionManager.java
rename to server/src/main/java/envoy/server/net/ConnectionManager.java
diff --git a/src/main/java/envoy/server/net/ObjectMessageProcessor.java b/server/src/main/java/envoy/server/net/ObjectMessageProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/net/ObjectMessageProcessor.java
rename to server/src/main/java/envoy/server/net/ObjectMessageProcessor.java
diff --git a/src/main/java/envoy/server/net/ObjectMessageReader.java b/server/src/main/java/envoy/server/net/ObjectMessageReader.java
similarity index 100%
rename from src/main/java/envoy/server/net/ObjectMessageReader.java
rename to server/src/main/java/envoy/server/net/ObjectMessageReader.java
diff --git a/src/main/java/envoy/server/net/ObjectWriteProxy.java b/server/src/main/java/envoy/server/net/ObjectWriteProxy.java
similarity index 100%
rename from src/main/java/envoy/server/net/ObjectWriteProxy.java
rename to server/src/main/java/envoy/server/net/ObjectWriteProxy.java
diff --git a/src/main/java/envoy/server/net/package-info.java b/server/src/main/java/envoy/server/net/package-info.java
similarity index 100%
rename from src/main/java/envoy/server/net/package-info.java
rename to server/src/main/java/envoy/server/net/package-info.java
diff --git a/src/main/java/envoy/server/package-info.java b/server/src/main/java/envoy/server/package-info.java
similarity index 100%
rename from src/main/java/envoy/server/package-info.java
rename to server/src/main/java/envoy/server/package-info.java
diff --git a/src/main/java/envoy/server/processors/ContactOperationProcessor.java b/server/src/main/java/envoy/server/processors/ContactOperationProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/ContactOperationProcessor.java
rename to server/src/main/java/envoy/server/processors/ContactOperationProcessor.java
diff --git a/src/main/java/envoy/server/processors/ContactSearchProcessor.java b/server/src/main/java/envoy/server/processors/ContactSearchProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/ContactSearchProcessor.java
rename to server/src/main/java/envoy/server/processors/ContactSearchProcessor.java
diff --git a/src/main/java/envoy/server/processors/GroupCreationProcessor.java b/server/src/main/java/envoy/server/processors/GroupCreationProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/GroupCreationProcessor.java
rename to server/src/main/java/envoy/server/processors/GroupCreationProcessor.java
diff --git a/src/main/java/envoy/server/processors/GroupMessageProcessor.java b/server/src/main/java/envoy/server/processors/GroupMessageProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/GroupMessageProcessor.java
rename to server/src/main/java/envoy/server/processors/GroupMessageProcessor.java
diff --git a/src/main/java/envoy/server/processors/GroupMessageStatusChangeProcessor.java b/server/src/main/java/envoy/server/processors/GroupMessageStatusChangeProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/GroupMessageStatusChangeProcessor.java
rename to server/src/main/java/envoy/server/processors/GroupMessageStatusChangeProcessor.java
diff --git a/src/main/java/envoy/server/processors/GroupResizeProcessor.java b/server/src/main/java/envoy/server/processors/GroupResizeProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/GroupResizeProcessor.java
rename to server/src/main/java/envoy/server/processors/GroupResizeProcessor.java
diff --git a/src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java b/server/src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java
rename to server/src/main/java/envoy/server/processors/IDGeneratorRequestProcessor.java
diff --git a/src/main/java/envoy/server/processors/LoginCredentialProcessor.java b/server/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/LoginCredentialProcessor.java
rename to server/src/main/java/envoy/server/processors/LoginCredentialProcessor.java
diff --git a/src/main/java/envoy/server/processors/MessageProcessor.java b/server/src/main/java/envoy/server/processors/MessageProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/MessageProcessor.java
rename to server/src/main/java/envoy/server/processors/MessageProcessor.java
diff --git a/src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java b/server/src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java
rename to server/src/main/java/envoy/server/processors/MessageStatusChangeProcessor.java
diff --git a/src/main/java/envoy/server/processors/NameChangeProcessor.java b/server/src/main/java/envoy/server/processors/NameChangeProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/NameChangeProcessor.java
rename to server/src/main/java/envoy/server/processors/NameChangeProcessor.java
diff --git a/src/main/java/envoy/server/processors/ObjectProcessor.java b/server/src/main/java/envoy/server/processors/ObjectProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/ObjectProcessor.java
rename to server/src/main/java/envoy/server/processors/ObjectProcessor.java
diff --git a/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java b/server/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
similarity index 100%
rename from src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
rename to server/src/main/java/envoy/server/processors/UserStatusChangeProcessor.java
diff --git a/src/main/java/envoy/server/processors/package-info.java b/server/src/main/java/envoy/server/processors/package-info.java
similarity index 100%
rename from src/main/java/envoy/server/processors/package-info.java
rename to server/src/main/java/envoy/server/processors/package-info.java
diff --git a/src/main/java/envoy/server/util/PasswordUtil.java b/server/src/main/java/envoy/server/util/PasswordUtil.java
similarity index 100%
rename from src/main/java/envoy/server/util/PasswordUtil.java
rename to server/src/main/java/envoy/server/util/PasswordUtil.java
diff --git a/src/main/java/envoy/server/util/VersionUtil.java b/server/src/main/java/envoy/server/util/VersionUtil.java
similarity index 100%
rename from src/main/java/envoy/server/util/VersionUtil.java
rename to server/src/main/java/envoy/server/util/VersionUtil.java
diff --git a/src/main/java/envoy/server/util/package-info.java b/server/src/main/java/envoy/server/util/package-info.java
similarity index 100%
rename from src/main/java/envoy/server/util/package-info.java
rename to server/src/main/java/envoy/server/util/package-info.java
diff --git a/src/main/java/module-info.java b/server/src/main/java/module-info.java
similarity index 100%
rename from src/main/java/module-info.java
rename to server/src/main/java/module-info.java
diff --git a/src/main/resources/META-INF/persistence.xml b/server/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from src/main/resources/META-INF/persistence.xml
rename to server/src/main/resources/META-INF/persistence.xml