diff --git a/.github/workflows/build-github-package.yml b/.github/workflows/build-github-package.yml
index 8ef301c..7391756 100644
--- a/.github/workflows/build-github-package.yml
+++ b/.github/workflows/build-github-package.yml
@@ -40,7 +40,7 @@ jobs:
         run: mvn -B package --file up-core-api/pom.xml
   
       - name: Publish maven package to GitHub Packages
-        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml --file up-core-api/pom.xml
+        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml --file pom.xml
         env:
           # GITHUB_TOKEN: ${{ github.token }}
          GITHUB_TOKEN: ${{ secrets.PKG_PUSH_TOKEN }}
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 7f1c10b..5a38579 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -21,4 +21,4 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build and Test with Maven
-      run: mvn -B package --file up-core-api/pom.xml
+      run: mvn -B package --file pom.xml
diff --git a/.github/workflows/build_deploy.yml b/.github/workflows/build_deploy.yml
index e2b9426..9557cad 100644
--- a/.github/workflows/build_deploy.yml
+++ b/.github/workflows/build_deploy.yml
@@ -28,7 +28,7 @@ jobs:
         gpg-passphrase: GPG_PASSPHRASE
 
     - name: Build and Publish to Apache Maven Central
-      run: mvn clean deploy --file up-core-api/pom.xml
+      run: mvn clean deploy --file pom.xml
       env:
         OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
         OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8fa8a45..133b6b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
 
     - name: Stage to Nexus and Release to Maven central
       run: |
-        mvn -B release:clean release:prepare -P release release:perform --file up-core-api/pom.xml
+        mvn -B release:clean release:prepare -P release release:perform --file pom.xml
       env:
         OSSRH_USER: ${{ secrets.ORG_OSSRH_USERNAME }}
         OSSRH_PASSWORD: ${{ secrets.ORG_OSSRH_PASSWORD }}
@@ -44,7 +44,7 @@ jobs:
 
     - if: cancelled() || failure()
       run: |
-        mvn -B release:rollback --file up-core-api/pom.xml
+        mvn -B release:rollback --file pom.xml
       env:
         GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index a272f92..1d50e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /uprotocol-spec.iml
 /up-spec.iml
 /up-core-api/target/
+/target/
\ No newline at end of file
diff --git a/up-core-api/pom.xml b/pom.xml
similarity index 100%
rename from up-core-api/pom.xml
rename to pom.xml